author | wenzelm |
Fri, 13 Apr 2012 19:44:15 +0200 | |
changeset 47457 | 5535d1a82e42 |
permissions | -rw-r--r-- |
47457
5535d1a82e42
recognize MacOS on modern Java implementations, notably OpenJDK 1.7;
wenzelm
parents:
diff
changeset
|
1 |
diff -ru 4.5.1/jEdit/org/gjt/sp/jedit/OperatingSystem.java 4.5.1/jEdit-patched/org/gjt/sp/jedit/OperatingSystem.java |
5535d1a82e42
recognize MacOS on modern Java implementations, notably OpenJDK 1.7;
wenzelm
parents:
diff
changeset
|
2 |
--- 4.5.1/jEdit/org/gjt/sp/jedit/OperatingSystem.java 2012-03-25 18:52:03.000000000 +0200 |
5535d1a82e42
recognize MacOS on modern Java implementations, notably OpenJDK 1.7;
wenzelm
parents:
diff
changeset
|
3 |
+++ 4.5.1/jEdit-patched/org/gjt/sp/jedit/OperatingSystem.java 2012-04-13 19:28:37.000000000 +0200 |
5535d1a82e42
recognize MacOS on modern Java implementations, notably OpenJDK 1.7;
wenzelm
parents:
diff
changeset
|
4 |
@@ -317,6 +317,10 @@ |
5535d1a82e42
recognize MacOS on modern Java implementations, notably OpenJDK 1.7;
wenzelm
parents:
diff
changeset
|
5 |
{ |
5535d1a82e42
recognize MacOS on modern Java implementations, notably OpenJDK 1.7;
wenzelm
parents:
diff
changeset
|
6 |
os = OS2; |
5535d1a82e42
recognize MacOS on modern Java implementations, notably OpenJDK 1.7;
wenzelm
parents:
diff
changeset
|
7 |
} |
5535d1a82e42
recognize MacOS on modern Java implementations, notably OpenJDK 1.7;
wenzelm
parents:
diff
changeset
|
8 |
+ else if(osName.contains("Mac OS X")) |
5535d1a82e42
recognize MacOS on modern Java implementations, notably OpenJDK 1.7;
wenzelm
parents:
diff
changeset
|
9 |
+ { |
5535d1a82e42
recognize MacOS on modern Java implementations, notably OpenJDK 1.7;
wenzelm
parents:
diff
changeset
|
10 |
+ os = MAC_OS_X; |
5535d1a82e42
recognize MacOS on modern Java implementations, notably OpenJDK 1.7;
wenzelm
parents:
diff
changeset
|
11 |
+ } |
5535d1a82e42
recognize MacOS on modern Java implementations, notably OpenJDK 1.7;
wenzelm
parents:
diff
changeset
|
12 |
else if(osName.contains("VMS")) |
5535d1a82e42
recognize MacOS on modern Java implementations, notably OpenJDK 1.7;
wenzelm
parents:
diff
changeset
|
13 |
{ |
5535d1a82e42
recognize MacOS on modern Java implementations, notably OpenJDK 1.7;
wenzelm
parents:
diff
changeset
|
14 |
os = VMS; |
5535d1a82e42
recognize MacOS on modern Java implementations, notably OpenJDK 1.7;
wenzelm
parents:
diff
changeset
|
15 |