| author | wenzelm |
| Mon, 18 Aug 2014 12:17:31 +0200 | |
| changeset 57978 | 8f4a332500e4 |
| parent 53898 | e4825d4c6bd7 |
| permissions | -rw-r--r-- |
|
53415
9ebab8b7d73c
updated to jedit_build-20130905 which is based on jedit-5.1.0;
wenzelm
parents:
50727
diff
changeset
|
1 |
diff -ru 5.1.0/jEdit/org/gjt/sp/jedit/Debug.java 5.1.0/jEdit-patched/org/gjt/sp/jedit/Debug.java |
|
9ebab8b7d73c
updated to jedit_build-20130905 which is based on jedit-5.1.0;
wenzelm
parents:
50727
diff
changeset
|
2 |
--- 5.1.0/jEdit/org/gjt/sp/jedit/Debug.java 2013-07-28 19:03:49.000000000 +0200 |
|
9ebab8b7d73c
updated to jedit_build-20130905 which is based on jedit-5.1.0;
wenzelm
parents:
50727
diff
changeset
|
3 |
+++ 5.1.0/jEdit-patched/org/gjt/sp/jedit/Debug.java 2013-09-05 10:55:36.388181955 +0200 |
|
50727
76ae4e6318fb
another attempt to get Mac OS X keyhandling right: ALTERNATIVE_DISPATCHER is off, but ALT_KEY_PRESSED_DISABLED is more careful to interpret ALT like ALT_GRAPH, which does not count as modifier here (NB: CONTROL + ALT means ALT_GRAPH on Windows, but ALT means ALT_GRAPH on Mac OS X);
wenzelm
parents:
50307
diff
changeset
|
4 |
@@ -109,7 +109,7 @@ |
|
53415
9ebab8b7d73c
updated to jedit_build-20130905 which is based on jedit-5.1.0;
wenzelm
parents:
50727
diff
changeset
|
5 |
* used to handle a modifier key press in conjunction with an alphabet |
|
9ebab8b7d73c
updated to jedit_build-20130905 which is based on jedit-5.1.0;
wenzelm
parents:
50727
diff
changeset
|
6 |
* key. <b>On by default on MacOS.</b> |
|
9ebab8b7d73c
updated to jedit_build-20130905 which is based on jedit-5.1.0;
wenzelm
parents:
50727
diff
changeset
|
7 |
*/ |
|
9ebab8b7d73c
updated to jedit_build-20130905 which is based on jedit-5.1.0;
wenzelm
parents:
50727
diff
changeset
|
8 |
- public static boolean ALTERNATIVE_DISPATCHER = OperatingSystem.isMacOS(); |
|
9ebab8b7d73c
updated to jedit_build-20130905 which is based on jedit-5.1.0;
wenzelm
parents:
50727
diff
changeset
|
9 |
+ public static boolean ALTERNATIVE_DISPATCHER = false; |
|
48787
ab3e7f40f341
fewer workarounds for MacOS to increase chances that COMMAND ("META") key works with Java 1.7 from Oracle;
wenzelm
parents:
48786
diff
changeset
|
10 |
|
|
53415
9ebab8b7d73c
updated to jedit_build-20130905 which is based on jedit-5.1.0;
wenzelm
parents:
50727
diff
changeset
|
11 |
/** |
|
9ebab8b7d73c
updated to jedit_build-20130905 which is based on jedit-5.1.0;
wenzelm
parents:
50727
diff
changeset
|
12 |
* If true, A+ shortcuts are disabled. If you use this, you should also |
| 48786 | 13 |