commit 4fd4c31bb6615826c91ac20a478b36f32fe74d9c
Author: Stephan Witt <[email protected]>
Date: Tue Dec 15 01:24:31 2015 +0100
#9875 disable the modifier check for LFUN_SELF_INSERT on Mac
diff --git a/src/frontends/qt4/GuiApplication.cpp
b/src/frontends/qt4/GuiApplication.cpp
index b760da8..4b6e769 100644
--- a/src/frontends/qt4/GuiApplication.cpp
+++ b/src/frontends/qt4/GuiApplication.cpp
@@ -2164,6 +2164,11 @@ void GuiApplication::processKeySym(KeySymbol const &
keysym, KeyModifier state)
current_view_->restartCursor();
return;
}
+ // The following modifier check is not needed on Mac.
+ // The keysym is either not text or it is different
+ // from the non-modifier keysym. See #9875 for the
+ // broken alt-modifier effect of having this code
active.
+#if !defined(Q_OS_MAC)
// If a non-Shift Modifier is used we have a non-bound
key sequence
// (such as Alt+j = j). This should be omitted (#5575).
// On Windows, AltModifier and ControlModifier are both
@@ -2182,6 +2187,7 @@ void GuiApplication::processKeySym(KeySymbol const &
keysym, KeyModifier state)
}
return;
}
+#endif
// Since all checks above were passed, we now really
have text that
// is to be inserted (e.g., AltGr-bound symbols). Thus
change the
// func to LFUN_SELF_INSERT and thus cause the text to
be inserted