--- a/src/Tools/jEdit/patches/scriptstyles Sat Jun 18 18:17:08 2011 +0200
+++ b/src/Tools/jEdit/patches/scriptstyles Sat Jun 18 18:31:55 2011 +0200
@@ -1,7 +1,19 @@
-diff -ru jEdit/org/gjt/sp/jedit/syntax/Token.java jEdit-patched/org/gjt/sp/jedit/syntax/Token.java
---- jEdit/org/gjt/sp/jedit/syntax/Token.java 2010-05-09 14:29:24.000000000 +0200
-+++ jEdit-patched/org/gjt/sp/jedit/syntax/Token.java 2011-06-15 13:48:42.000000000 +0200
-@@ -57,7 +57,7 @@
+diff -ru jEdit/org/gjt/sp/jedit/Buffer.java jEdit-patched/org/gjt/sp/jedit/Buffer.java
+--- jEdit/org/gjt/sp/jedit/Buffer.java 2010-05-09 14:29:25.000000000 +0200
++++ jEdit-patched/org/gjt/sp/jedit/Buffer.java 2011-06-18 18:28:19.000000000 +0200
+@@ -2232,7 +2232,7 @@
+ start = next;
+ token = token.next;
+ }
+- if (token.id == Token.END || token.id == Token.NULL)
++ if (token.id == Token.END || (token.id % Token.ID_COUNT) == Token.NULL)
+ {
+ JOptionPane.showMessageDialog(jEdit.getActiveView(),
+ jEdit.getProperty("syntax-style-no-token.message"),
+diff -ru jEdit/org/gjt/sp/jedit/syntax/Token.java jEdit-patched/org/gjt/sp/jedit/syntax/Token.java
+--- jEdit/org/gjt/sp/jedit/syntax/Token.java 2010-05-09 14:29:24.000000000 +0200
++++ jEdit-patched/org/gjt/sp/jedit/syntax/Token.java 2011-06-18 18:28:10.000000000 +0200
+@@ -57,7 +57,7 @@
*/
public static String tokenToString(byte token)
{
@@ -10,10 +22,10 @@
} //}}}
//{{{ Token types
-diff -ru jEdit/org/gjt/sp/util/SyntaxUtilities.java jEdit-patched/org/gjt/sp/util/SyntaxUtilities.java
---- jEdit/org/gjt/sp/util/SyntaxUtilities.java 2010-05-09 14:29:29.000000000 +0200
-+++ jEdit-patched/org/gjt/sp/util/SyntaxUtilities.java 2011-06-15 14:11:30.000000000 +0200
-@@ -26,6 +26,7 @@
+diff -ru jEdit/org/gjt/sp/util/SyntaxUtilities.java jEdit-patched/org/gjt/sp/util/SyntaxUtilities.java
+--- jEdit/org/gjt/sp/util/SyntaxUtilities.java 2010-05-09 14:29:29.000000000 +0200
++++ jEdit-patched/org/gjt/sp/util/SyntaxUtilities.java 2011-06-18 18:28:10.000000000 +0200
+@@ -26,6 +26,7 @@
//{{{ Imports
import java.awt.Color;
import java.awt.Font;
@@ -21,7 +33,7 @@
import java.util.Locale;
import java.util.StringTokenizer;
import org.gjt.sp.jedit.syntax.SyntaxStyle;
-@@ -194,6 +195,17 @@
+@@ -194,6 +195,17 @@
}
/**
@@ -39,7 +51,7 @@
* Loads the syntax styles from the properties, giving them the specified
* base font family and size.
* @param family The font family
-@@ -203,10 +215,10 @@
+@@ -203,10 +215,10 @@
*/
public static SyntaxStyle[] loadStyles(String family, int size, boolean color)
{
@@ -52,7 +64,7 @@
{
try
{
-@@ -223,6 +235,16 @@
+@@ -223,6 +235,16 @@
}
}