Mercurial Mercurial > repos > isabelle / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
src/Tools/jEdit/patches/jedit/macos
author wenzelm
Sat, 01 Dec 2012 19:51:43 +0100
changeset 50306 b655d2d0406d
parent 50305 8290dc6c8d7f
child 50307 6f64ce2e5a40
permissions -rw-r--r--
updated to jedit-5.0.0;
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
50306
b655d2d0406d updated to jedit-5.0.0;
wenzelm
parents: 50305
diff changeset 
     1
 
diff -ru 5.0.0/jEdit/org/gjt/sp/jedit/OperatingSystem.java 5.0.0/jEdit-patched/org/gjt/sp/jedit/OperatingSystem.java
b655d2d0406d updated to jedit-5.0.0;
wenzelm
parents: 50305
diff changeset 
     2
 
--- 5.0.0/jEdit/org/gjt/sp/jedit/OperatingSystem.java	2012-11-17 16:42:29.000000000 +0100
b655d2d0406d updated to jedit-5.0.0;
wenzelm
parents: 50305
diff changeset 
     3
 
+++ 5.0.0/jEdit-patched/org/gjt/sp/jedit/OperatingSystem.java	2012-12-01 17:32:47.000000000 +0100
b655d2d0406d updated to jedit-5.0.0;
wenzelm
parents: 50305
diff changeset 
     4
 
@@ -318,6 +318,10 @@
48786
2b08d10a2f75 updated to jedit-4.5.2 (still unchanged);
wenzelm
parents:
diff changeset 
     5
 
 			{
50306
b655d2d0406d updated to jedit-5.0.0;
wenzelm
parents: 50305
diff changeset 
     6
 
 				os = WINDOWS_NT;
48786
2b08d10a2f75 updated to jedit-4.5.2 (still unchanged);
wenzelm
parents:
diff changeset 
     7
 
 			}
2b08d10a2f75 updated to jedit-4.5.2 (still unchanged);
wenzelm
parents:
diff changeset 
     8
 
+			else if(osName.contains("Mac OS X"))
2b08d10a2f75 updated to jedit-4.5.2 (still unchanged);
wenzelm
parents:
diff changeset 
     9
 
+			{
2b08d10a2f75 updated to jedit-4.5.2 (still unchanged);
wenzelm
parents:
diff changeset 
    10
 
+				os = MAC_OS_X;
2b08d10a2f75 updated to jedit-4.5.2 (still unchanged);
wenzelm
parents:
diff changeset 
    11
 
+			}
2b08d10a2f75 updated to jedit-4.5.2 (still unchanged);
wenzelm
parents:
diff changeset 
    12
 
 			else if(osName.contains("VMS"))
2b08d10a2f75 updated to jedit-4.5.2 (still unchanged);
wenzelm
parents:
diff changeset 
    13
 
 			{
2b08d10a2f75 updated to jedit-4.5.2 (still unchanged);
wenzelm
parents:
diff changeset 
    14
 
 				os = VMS;
50306
b655d2d0406d updated to jedit-5.0.0;
wenzelm
parents: 50305
diff changeset 
    15
 
diff -ru 5.0.0/jEdit/org/gjt/sp/jedit/Debug.java 5.0.0/jEdit-patched/org/gjt/sp/jedit/Debug.java
b655d2d0406d updated to jedit-5.0.0;
wenzelm
parents: 50305
diff changeset 
    16
 
--- 5.0.0/jEdit/org/gjt/sp/jedit/Debug.java	2012-11-17 16:42:29.000000000 +0100
b655d2d0406d updated to jedit-5.0.0;
wenzelm
parents: 50305
diff changeset 
    17
 
+++ 5.0.0/jEdit-patched/org/gjt/sp/jedit/Debug.java	2012-12-01 17:31:24.000000000 +0100
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 
    18
 
@@ -109,7 +109,8 @@
ab3e7f40f341 fewer workarounds for MacOS to increase chances that COMMAND ("META") key works with Java 1.7 from Oracle;
wenzelm
parents: 48786
diff changeset 
    19
 
 	 * used to handle a modifier key press in conjunction with an alphabet
ab3e7f40f341 fewer workarounds for MacOS to increase chances that COMMAND ("META") key works with Java 1.7 from Oracle;
wenzelm
parents: 48786
diff changeset 
    20
 
 	 * key. <b>On by default on MacOS.</b>
ab3e7f40f341 fewer workarounds for MacOS to increase chances that COMMAND ("META") key works with Java 1.7 from Oracle;
wenzelm
parents: 48786
diff changeset 
    21
 
 	 */
ab3e7f40f341 fewer workarounds for MacOS to increase chances that COMMAND ("META") key works with Java 1.7 from Oracle;
wenzelm
parents: 48786
diff changeset 
    22
 
-	public static boolean ALTERNATIVE_DISPATCHER = OperatingSystem.isMacOS();
ab3e7f40f341 fewer workarounds for MacOS to increase chances that COMMAND ("META") key works with Java 1.7 from Oracle;
wenzelm
parents: 48786
diff changeset 
    23
 
+	public static boolean ALTERNATIVE_DISPATCHER = OperatingSystem.isMacOS() &&
ab3e7f40f341 fewer workarounds for MacOS to increase chances that COMMAND ("META") key works with Java 1.7 from Oracle;
wenzelm
parents: 48786
diff changeset 
    24
 
+		System.getProperty("java.version").startsWith("1.6.");
ab3e7f40f341 fewer workarounds for MacOS to increase chances that COMMAND ("META") key works with Java 1.7 from Oracle;
wenzelm
parents: 48786
diff changeset 
    25
ab3e7f40f341 fewer workarounds for MacOS to increase chances that COMMAND ("META") key works with Java 1.7 from Oracle;
wenzelm
parents: 48786
diff changeset 
    26
 
 	/**
ab3e7f40f341 fewer workarounds for MacOS to increase chances that COMMAND ("META") key works with Java 1.7 from Oracle;
wenzelm
parents: 48786
diff changeset 
    27
 
 	 * If true, A+ shortcuts are disabled. If you use this, you should also
48786
2b08d10a2f75 updated to jedit-4.5.2 (still unchanged);
wenzelm
parents:
diff changeset 
    28
 














isabelle