fewer workarounds for MacOS to increase chances that COMMAND ("META") key works with Java 1.7 from Oracle;
authorwenzelm
Mon, 13 Aug 2012 19:51:48 +0200
changeset 48787 ab3e7f40f341
parent 48786 2b08d10a2f75
child 48789 7476665f3e0f
fewer workarounds for MacOS to increase chances that COMMAND ("META") key works with Java 1.7 from Oracle;
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. <b>On by default on MacOS.</b>
+ 	 */
+-	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