diff -r 2b08d10a2f75 -r ab3e7f40f341 src/Tools/jEdit/patches/jedit-4.5.2/macos --- a/src/Tools/jEdit/patches/jedit-4.5.2/macos Mon Aug 13 19:36:34 2012 +0200 +++ b/src/Tools/jEdit/patches/jedit-4.5.2/macos Mon Aug 13 19:51:48 2012 +0200 @@ -12,4 +12,17 @@ else if(osName.contains("VMS")) { os = VMS; +diff -ru jEdit/org/gjt/sp/jedit/Debug.java jEdit-patched/org/gjt/sp/jedit/Debug.java +--- jEdit/org/gjt/sp/jedit/Debug.java 2012-06-15 22:20:24.000000000 +0200 ++++ jEdit-patched/org/gjt/sp/jedit/Debug.java 2012-08-13 19:44:43.000000000 +0200 +@@ -109,7 +109,8 @@ + * used to handle a modifier key press in conjunction with an alphabet + * key. On by default on MacOS. + */ +- public static boolean ALTERNATIVE_DISPATCHER = OperatingSystem.isMacOS(); ++ public static boolean ALTERNATIVE_DISPATCHER = OperatingSystem.isMacOS() && ++ System.getProperty("java.version").startsWith("1.6."); + + /** + * If true, A+ shortcuts are disabled. If you use this, you should also