# HG changeset patch
# User wenzelm
# Date 1378415668 -7200
# Node ID f5b1f555b73badcc58c4ded2950809c5f845ecaf
# Parent dd64696d267a3a9325ce3a03616b739bfa38e04b# Parent 091b05002c5490861ad3397917b29b163e147cbd
merged
diff -r dd64696d267a -r f5b1f555b73b Admin/Release/CHECKLIST
--- a/Admin/Release/CHECKLIST Thu Sep 05 18:05:03 2013 +0200
+++ b/Admin/Release/CHECKLIST Thu Sep 05 23:14:28 2013 +0200
@@ -7,8 +7,6 @@
- test polyml-5.4.1, polyml-5.4.0, polyml-5.3.0, smlnj;
-- test scala-2.9.2;
-
- test Proof General 4.1, 3.7.1.1;
- test 'display_drafts' command;
@@ -27,8 +25,7 @@
- update https://isabelle.in.tum.de/repos/website;
-- maintain Docs:
- doc/Contents
+- maintain doc/Contents;
- maintain Logics:
ROOTS
diff -r dd64696d267a -r f5b1f555b73b Admin/Windows/Installer/sfx.txt
--- a/Admin/Windows/Installer/sfx.txt Thu Sep 05 18:05:03 2013 +0200
+++ b/Admin/Windows/Installer/sfx.txt Thu Sep 05 23:14:28 2013 +0200
@@ -5,5 +5,5 @@
ExtractPathText="Target directory"
ExtractTitle="Unpacking {ISABELLE_NAME} ..."
Shortcut="Du,{%%T\{ISABELLE_NAME}\{ISABELLE_NAME}.exe},{},{},{},{{ISABELLE_NAME}},{%%T\{ISABELLE_NAME}}"
-RunProgram="\"%%T\{ISABELLE_NAME}\{ISABELLE_NAME}.exe\" -i"
+RunProgram="\"%%T\{ISABELLE_NAME}\{ISABELLE_NAME}.exe\""
;!@InstallEnd@!
diff -r dd64696d267a -r f5b1f555b73b Admin/Windows/launch4j/isabelle.xml
--- a/Admin/Windows/launch4j/isabelle.xml Thu Sep 05 18:05:03 2013 +0200
+++ b/Admin/Windows/launch4j/isabelle.xml Thu Sep 05 23:14:28 2013 +0200
@@ -20,11 +20,11 @@
%EXEDIR%\lib\classes\ext\scala-swing.jar
- %EXEDIR%\contrib\jdk-7u21\x86-cygwin\jdk1.7.0_21
+ %EXEDIR%\contrib\jdk\x86-cygwin
jdkOnly
- -Disabelle.home="%EXEDIR%" -Dcygwin.root="%EXEDIR%\\contrib\\cygwin"
+ -Disabelle.home="%EXEDIR%"
isabelle.bmp
diff -r dd64696d267a -r f5b1f555b73b Admin/components/bundled-windows
--- a/Admin/components/bundled-windows Thu Sep 05 18:05:03 2013 +0200
+++ b/Admin/components/bundled-windows Thu Sep 05 23:14:28 2013 +0200
@@ -1,3 +1,3 @@
#additional components to be bundled for release
cygwin-20130117
-windows_app-20130716
+windows_app-20130905
diff -r dd64696d267a -r f5b1f555b73b Admin/components/components.sha1
--- a/Admin/components/components.sha1 Thu Sep 05 18:05:03 2013 +0200
+++ b/Admin/components/components.sha1 Thu Sep 05 23:14:28 2013 +0200
@@ -18,6 +18,7 @@
38d2d2a91c66714c18430e136e7e5191af3996e6 jdk-7u11.tar.gz
d765bc4ad2f34d494429b2a8c1563c49db224944 jdk-7u13.tar.gz
13a265e4b706ece26fdfa6fc9f4a3dd1366016d2 jdk-7u21.tar.gz
+5080274f8721a18111a7f614793afe6c88726739 jdk-7u25.tar.gz
ec740ee9ffd43551ddf1e5b91641405116af6291 jdk-7u6.tar.gz
7d5b152ac70f720bb9e783fa45ecadcf95069584 jdk-7u9.tar.gz
44775a22f42a9d665696bfb49e53c79371c394b0 jedit_build-20111217.tar.gz
@@ -31,6 +32,7 @@
8fa0c67f59beba369ab836562eed4e56382f672a jedit_build-20121201.tar.gz
06e9be2627ebb95c45a9bcfa025d2eeef086b408 jedit_build-20130104.tar.gz
c85c0829b8170f25aa65ec6852f505ce2a50639b jedit_build-20130628.tar.gz
+5de3e399be2507f684b49dfd13da45228214bbe4 jedit_build-20130905.tar.gz
8122526f1fc362ddae1a328bdbc2152853186fee jfreechart-1.0.14.tar.gz
6c737137cc597fc920943783382e928ea79e3feb kodkodi-1.2.16.tar.gz
5f95c96bb99927f3a026050f85bd056f37a9189e kodkodi-1.5.2.tar.gz
@@ -52,6 +54,7 @@
1f4a2053cc1f34fa36c4d9d2ac906ad4ebc863fd sumatra_pdf-2.1.1.tar.gz
869ea6d8ea35c8ba68d7fcb028f16b2b7064c5fd vampire-1.0.tar.gz
81d21dfd0ea5c58f375301f5166be9dbf8921a7a windows_app-20130716.tar.gz
+fe15e1079cf5ad86f3cbab4553722a0d20002d11 windows_app-20130905.tar.gz
2ae13aa17d0dc95ce254a52f1dba10929763a10d xz-java-1.2.tar.gz
4530a1aa6f4498ee3d78d6000fa71a3f63bd077f yices-1.0.28.tar.gz
12ae71acde43bd7bed1e005c43034b208c0cba4c z3-3.2.tar.gz
diff -r dd64696d267a -r f5b1f555b73b Admin/components/main
--- a/Admin/components/main Thu Sep 05 18:05:03 2013 +0200
+++ b/Admin/components/main Thu Sep 05 23:14:28 2013 +0200
@@ -3,8 +3,8 @@
e-1.8
exec_process-1.0.3
Haskabelle-2013
-jdk-7u21
-jedit_build-20130628
+jdk-7u25
+jedit_build-20130905
jfreechart-1.0.14
kodkodi-1.5.2
polyml-5.5.0-3
diff -r dd64696d267a -r f5b1f555b73b Admin/java/build
--- a/Admin/java/build Thu Sep 05 18:05:03 2013 +0200
+++ b/Admin/java/build Thu Sep 05 23:14:28 2013 +0200
@@ -11,8 +11,8 @@
## parameters
-VERSION="7u21"
-FULL_VERSION="1.7.0_21"
+VERSION="7u25"
+FULL_VERSION="1.7.0_25"
ARCHIVE_LINUX32="jdk-${VERSION}-linux-i586.tar.gz"
ARCHIVE_LINUX64="jdk-${VERSION}-linux-x64.tar.gz"
@@ -37,8 +37,6 @@
Linux, Mac OS X, Windows work uniformly, depending on certain
platform-specific subdirectories.
-
-Note that Java 1.7 on Mac OS X requires 64bit hardware!
EOF
@@ -53,10 +51,10 @@
echo "### Java 1.7 unavailable on 32bit Macintosh!" >&2
;;
x86_64-darwin)
- ISABELLE_JDK_HOME="\$COMPONENT/\$ISABELLE_PLATFORM64/jdk${FULL_VERSION}.jdk/Contents/Home"
+ ISABELLE_JDK_HOME="\$COMPONENT/\$ISABELLE_PLATFORM64/Contents/Home"
;;
*)
- ISABELLE_JDK_HOME="\$COMPONENT/\${ISABELLE_PLATFORM64:-\$ISABELLE_PLATFORM32}/jdk${FULL_VERSION}"
+ ISABELLE_JDK_HOME="\$COMPONENT/\${ISABELLE_PLATFORM64:-\$ISABELLE_PLATFORM32}"
;;
esac
@@ -82,6 +80,18 @@
tar -C "$DIR/x86_64-darwin" -xf "$ARCHIVE_DARWIN"
tar -C "$DIR/x86-cygwin" -xf "$ARCHIVE_WINDOWS"
+(
+ cd "$DIR"
+ for PLATFORM in x86-linux x86_64-linux x86-cygwin
+ do
+ mv "$PLATFORM/jdk${FULL_VERSION}"/* "$PLATFORM"/.
+ rmdir "$PLATFORM/jdk${FULL_VERSION}"
+ done
+ PLATFORM=x86_64-darwin
+ mv "$PLATFORM/jdk${FULL_VERSION}.jdk"/* "$PLATFORM"/.
+ rmdir "$PLATFORM/jdk${FULL_VERSION}.jdk"
+)
+
chgrp -R isabelle "$DIR"
chmod -R a+r "$DIR"
chmod -R a+X "$DIR"
@@ -90,13 +100,13 @@
echo "Sharing ..."
(
- cd "$DIR/x86-linux/jdk${FULL_VERSION}"
+ cd "$DIR/x86-linux"
for FILE in $(find . -type f)
do
for OTHER in \
- "../../x86_64-linux/jdk${FULL_VERSION}/$FILE" \
- "../../x86_64-darwin/jdk${FULL_VERSION}.jdk/Contents/Home/$FILE" \
- "../../x86-cygwin/jdk${FULL_VERSION}/$FILE"
+ "../../x86_64-linux/$FILE" \
+ "../../x86_64-darwin/Contents/Home/$FILE" \
+ "../../x86-cygwin/$FILE"
do
if cmp -s "$FILE" "$OTHER"
then
diff -r dd64696d267a -r f5b1f555b73b Admin/lib/Tools/makedist_bundle
--- a/Admin/lib/Tools/makedist_bundle Thu Sep 05 18:05:03 2013 +0200
+++ b/Admin/lib/Tools/makedist_bundle Thu Sep 05 23:14:28 2013 +0200
@@ -48,7 +48,7 @@
ISABELLE_TARGET="$TMP/$ISABELLE_NAME"
-tar -C "$TMP" -x -z -f "$ARCHIVE"
+tar -C "$TMP" -x -z -f "$ARCHIVE" || exit 2
# bundled components
@@ -83,10 +83,18 @@
perl -e "exit((stat('${CONTRIB}'))[7] == 0 ? 0 : 1);" && exit 2
fi
- tar -C "$ISABELLE_TARGET/contrib" -x -z -f "$CONTRIB"
+ tar -C "$ISABELLE_TARGET/contrib" -x -z -f "$CONTRIB" || exit 2
if [ -f "$COMPONENT_DIR/etc/settings" -o -f "$COMPONENT_DIR/etc/components" ]
then
- echo "contrib/$COMPONENT" >> "$ISABELLE_TARGET/etc/components"
+ case "$COMPONENT" in
+ jdk-*)
+ mv "$ISABELLE_TARGET/contrib/$COMPONENT" "$ISABELLE_TARGET/contrib/jdk"
+ echo "contrib/jdk" >> "$ISABELLE_TARGET/etc/components"
+ ;;
+ *)
+ echo "contrib/$COMPONENT" >> "$ISABELLE_TARGET/etc/components"
+ ;;
+ esac
fi
;;
esac
@@ -154,6 +162,8 @@
find . -type l -exec echo "{}" ";" -exec readlink "{}" ";" \
> "contrib/cygwin/isabelle/symlinks"
+
+ touch "contrib/cygwin/isabelle/uninitialized"
)
perl -pi -e "s,/bin/rebaseall.*,/isabelle/rebaseall,g;" \
@@ -202,7 +212,7 @@
cp -R "$APP_TEMPLATE/Resources/." "$APP/Contents/Resources/."
cp "$APP_TEMPLATE/../isabelle.icns" "$APP/Contents/Resources/."
- ln -sf "../Resources/${ISABELLE_NAME}/contrib/jdk-7u21/x86_64-darwin/jdk1.7.0_21.jdk" \
+ ln -sf "../Resources/${ISABELLE_NAME}/contrib/jdk/x86_64-darwin" \
"$APP/Contents/PlugIns/jdk"
cp macos_app/JavaAppLauncher "$APP/Contents/MacOS/." && \
diff -r dd64696d267a -r f5b1f555b73b src/Pure/System/cygwin_init.scala
--- a/src/Pure/System/cygwin_init.scala Thu Sep 05 18:05:03 2013 +0200
+++ b/src/Pure/System/cygwin_init.scala Thu Sep 05 23:14:28 2013 +0200
@@ -7,7 +7,6 @@
package isabelle
-import java.lang.System
import java.io.{File => JFile, BufferedReader, InputStreamReader}
import java.nio.file.{Paths, Files}
import java.awt.{GraphicsEnvironment, Point, Font}
@@ -21,33 +20,9 @@
object Cygwin_Init
{
- /* command-line entry point */
-
- def main(args: Array[String]) =
- {
- GUI.init_laf()
- try {
- require(Platform.is_windows)
-
- val isabelle_home = System.getProperty("isabelle.home")
- if (isabelle_home == null || isabelle_home == "")
- error("Unknown Isabelle home directory")
- if (!(new JFile(isabelle_home)).isDirectory)
- error("Bad Isabelle home directory: " + quote(isabelle_home))
+ /* main GUI entry point */
- Swing_Thread.later { main_frame(isabelle_home) }
- }
- catch {
- case exn: Throwable =>
- GUI.error_dialog(null, "Isabelle init failure", GUI.scrollable_text(Exn.message(exn)))
- sys.exit(2)
- }
- }
-
-
- /* main window */
-
- private def main_frame(isabelle_home: String) = new MainFrame
+ def main_frame(isabelle_home: String, start: => Unit) = new MainFrame
{
title = "Isabelle system initialization"
iconImage = new ImageIcon(isabelle_home + "\\lib\\logo\\isabelle.gif").getImage
@@ -73,7 +48,17 @@
/* exit button */
var _return_code: Option[Int] = None
- def maybe_exit(): Unit = _return_code.foreach(sys.exit(_))
+ def maybe_exit()
+ {
+ _return_code match {
+ case None =>
+ case Some(0) =>
+ visible = false
+ default_thread_pool.submit(() => start)
+ case Some(rc) =>
+ sys.exit(rc)
+ }
+ }
def return_code(rc: Int): Unit =
Swing_Thread.later {
@@ -102,7 +87,7 @@
default_thread_pool.submit(() =>
try {
- init(isabelle_home, echo)
+ init_filesystem(isabelle_home, echo)
return_code(0)
}
catch {
@@ -116,13 +101,10 @@
/* init Cygwin file-system */
- private def init(isabelle_home: String, echo: String => Unit)
+ private def init_filesystem(isabelle_home: String, echo: String => Unit)
{
val cygwin_root = isabelle_home + "\\contrib\\cygwin"
- if (!(new JFile(cygwin_root)).isDirectory)
- error("Bad Isabelle Cygwin directory: " + quote(cygwin_root))
-
def execute(args: String*): Int =
{
val cwd = new JFile(isabelle_home)
@@ -148,7 +130,7 @@
echo("symlinks ...")
val symlinks =
{
- val path = (new JFile(cygwin_root, "isabelle\\symlinks")).toPath
+ val path = (new JFile(cygwin_root + "\\isabelle\\symlinks")).toPath
Files.readAllLines(path, UTF8.charset).toArray.toList.asInstanceOf[List[String]]
}
@tailrec def recover_symlinks(list: List[String]): Unit =
@@ -177,7 +159,6 @@
execute(cygwin_root + "\\bin\\bash.exe", "/isabelle/postinstall")
echo("init ...")
- System.setProperty("cygwin.root", cygwin_root)
Isabelle_System.init()
echo("OK")
}
diff -r dd64696d267a -r f5b1f555b73b src/Pure/Tools/main.scala
--- a/src/Pure/Tools/main.scala Thu Sep 05 18:05:03 2013 +0200
+++ b/src/Pure/Tools/main.scala Thu Sep 05 23:14:28 2013 +0200
@@ -1,37 +1,74 @@
/* Title: Pure/Tools/main.scala
Author: Makarius
-Default Isabelle application wrapper.
+Main Isabelle application entry point.
*/
package isabelle
-import scala.swing.TextArea
+
+import java.lang.System
+import java.io.{File => JFile}
object Main
{
def main(args: Array[String])
{
- args.toList match {
- case "-i" :: rest =>
- if (Platform.is_windows) Cygwin_Init.main(rest.toArray)
+ def start: Unit =
+ {
+ val (out, rc) =
+ try {
+ GUI.init_laf()
+ Isabelle_System.init()
+ Isabelle_System.isabelle_tool("jedit", ("-s" :: "--" :: args.toList): _*)
+ }
+ catch { case exn: Throwable => (Exn.message(exn), 2) }
+
+ if (rc != 0)
+ GUI.dialog(null, "Isabelle", "Isabelle output",
+ GUI.scrollable_text(out + "\nReturn code: " + rc))
+
+ sys.exit(rc)
+ }
+
+ if (Platform.is_windows) {
+ val init_isabelle_home =
+ try {
+ GUI.init_laf()
+
+ val isabelle_home0 = System.getenv("ISABELLE_HOME_WINDOWS")
+ val isabelle_home = System.getProperty("isabelle.home")
- case _ =>
- val (out, rc) =
- try {
- GUI.init_laf()
- Isabelle_System.init()
- Isabelle_System.isabelle_tool("jedit", ("-s" :: "--" :: args.toList): _*)
+ if (isabelle_home0 != null && isabelle_home0 != "") None
+ else {
+ if (isabelle_home == null || isabelle_home == "")
+ error("Unknown Isabelle home directory")
+ if (!(new JFile(isabelle_home)).isDirectory)
+ error("Bad Isabelle home directory: " + quote(isabelle_home))
+
+ val cygwin_root = isabelle_home + "\\contrib\\cygwin"
+ if ((new JFile(cygwin_root)).isDirectory)
+ System.setProperty("cygwin.root", cygwin_root)
+
+ val uninitialized_file = new JFile(cygwin_root, "isabelle\\uninitialized")
+ val uninitialized = uninitialized_file.isFile && uninitialized_file.delete
+
+ if (uninitialized) Some(isabelle_home) else None
}
- catch { case exn: Throwable => (Exn.message(exn), 2) }
-
- if (rc != 0)
- GUI.dialog(null, "Isabelle", "Isabelle output",
- GUI.scrollable_text(out + "\nReturn code: " + rc))
-
- sys.exit(rc)
+ }
+ catch {
+ case exn: Throwable =>
+ GUI.dialog(null, "Isabelle", GUI.scrollable_text(Exn.message(exn)))
+ sys.exit(2)
+ }
+ init_isabelle_home match {
+ case Some(isabelle_home) =>
+ Swing_Thread.later { Cygwin_Init.main_frame(isabelle_home, start) }
+ case None => start
+ }
}
+ else start
}
}
diff -r dd64696d267a -r f5b1f555b73b src/Tools/jEdit/lib/Tools/jedit
--- a/src/Tools/jEdit/lib/Tools/jedit Thu Sep 05 18:05:03 2013 +0200
+++ b/src/Tools/jEdit/lib/Tools/jedit Thu Sep 05 23:14:28 2013 +0200
@@ -221,6 +221,7 @@
"$ISABELLE_JEDIT_BUILD_HOME/contrib/cobra.jar"
"$ISABELLE_JEDIT_BUILD_HOME/contrib/js.jar"
"$ISABELLE_JEDIT_BUILD_HOME/contrib/idea-icons.jar"
+ "$ISABELLE_JEDIT_BUILD_HOME/contrib/jsr305-2.0.0.jar"
)
declare -a JFREECHART_JARS=()
diff -r dd64696d267a -r f5b1f555b73b src/Tools/jEdit/patches/jedit/annotation
--- a/src/Tools/jEdit/patches/jedit/annotation Thu Sep 05 18:05:03 2013 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-diff -ru 5.0.0/jEdit/org/gjt/sp/jedit/input/AbstractInputHandler.java 5.0.0/jEdit-patched/org/gjt/sp/jedit/input/AbstractInputHandler.java
---- 5.0.0/jEdit/org/gjt/sp/jedit/input/AbstractInputHandler.java 2012-11-17 16:41:23.000000000 +0100
-+++ 5.0.0/jEdit-patched/org/gjt/sp/jedit/input/AbstractInputHandler.java 2012-12-01 18:40:31.000000000 +0100
-@@ -29,8 +29,6 @@
- import java.awt.event.KeyEvent;
- import java.util.Hashtable;
- import java.util.StringTokenizer;
--import javax.annotation.Nonnull;
--import javax.annotation.Nullable;
-
- import org.gjt.sp.jedit.JEditAbstractEditAction;
- import org.gjt.sp.jedit.gui.ShortcutPrefixActiveEvent;
-@@ -198,8 +196,7 @@
- * @param keyBinding The key binding
- * @since jEdit 3.2pre5
- */
-- @Nullable
-- public Object getKeyBinding(@Nonnull String keyBinding)
-+ public Object getKeyBinding(String keyBinding)
- {
- Hashtable current = bindings;
- StringTokenizer st = new StringTokenizer(keyBinding);
-diff -ru 5.0.0/jEdit/org/gjt/sp/jedit/jEdit.java 5.0.0/jEdit-patched/org/gjt/sp/jedit/jEdit.java
---- 5.0.0/jEdit/org/gjt/sp/jedit/jEdit.java 2012-11-17 16:42:29.000000000 +0100
-+++ 5.0.0/jEdit-patched/org/gjt/sp/jedit/jEdit.java 2012-12-01 18:40:40.000000000 +0100
-@@ -35,8 +35,6 @@
- import org.gjt.sp.jedit.View.ViewConfig;
- import org.gjt.sp.jedit.bsh.UtilEvalError;
-
--import javax.annotation.Nonnull;
--import javax.annotation.Nullable;
- import javax.swing.*;
- import java.awt.event.*;
- import java.io.*;
-@@ -3853,8 +3851,7 @@
-
- } //}}}
-
-- @Nonnull
-- private static String getPLAFClassName(@Nullable String lf)
-+ private static String getPLAFClassName(String lf)
- {
- if (lf != null && lf.length() != 0)
- {
-
diff -r dd64696d267a -r f5b1f555b73b src/Tools/jEdit/patches/jedit/brackets
--- a/src/Tools/jEdit/patches/jedit/brackets Thu Sep 05 18:05:03 2013 +0200
+++ b/src/Tools/jEdit/patches/jedit/brackets Thu Sep 05 23:14:28 2013 +0200
@@ -1,5 +1,6 @@
---- 5.0.0/jEdit/org/gjt/sp/jedit/TextUtilities.java 2012-11-17 16:42:29.000000000 +0100
-+++ 5.0.0/jEdit-patched/org/gjt/sp/jedit/TextUtilities.java 2013-08-24 15:58:43.075546141 +0200
+diff -ru 5.1.0/jEdit/org/gjt/sp/jedit/TextUtilities.java 5.1.0/jEdit-patched/org/gjt/sp/jedit/TextUtilities.java
+--- 5.1.0/jEdit/org/gjt/sp/jedit/TextUtilities.java 2013-07-28 19:03:24.000000000 +0200
++++ 5.1.0/jEdit-patched/org/gjt/sp/jedit/TextUtilities.java 2013-09-05 10:51:09.996193290 +0200
@@ -97,6 +97,22 @@
case '}': if (direction != null) direction[0] = false; return '{';
case '<': if (direction != null) direction[0] = true; return '>';
diff -r dd64696d267a -r f5b1f555b73b src/Tools/jEdit/patches/jedit/completion
--- a/src/Tools/jEdit/patches/jedit/completion Thu Sep 05 18:05:03 2013 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-diff -ru 5.0.0/jEdit/org/gjt/sp/jedit/gui/CompletionPopup.java 5.0.0/jEdit-patched/org/gjt/sp/jedit/gui/CompletionPopup.java
---- 5.0.0/jEdit/org/gjt/sp/jedit/gui/CompletionPopup.java 2012-11-17 16:41:58.000000000 +0100
-+++ 5.0.0/jEdit-patched/org/gjt/sp/jedit/gui/CompletionPopup.java 2013-01-04 14:25:57.095172180 +0100
-@@ -113,9 +113,9 @@
- list.setCellRenderer(new CellRenderer());
- list.addKeyListener(keyHandler);
- list.addMouseListener(new MouseHandler());
-+ list.setFocusTraversalKeysEnabled(false);
-
- JPanel content = new JPanel(new BorderLayout());
-- content.setFocusTraversalKeysEnabled(false);
- // stupid scrollbar policy is an attempt to work around
- // bugs people have been seeing with IBM's JDK -- 7 Sep 2000
- JScrollPane scroller = new JScrollPane(list,
-
diff -r dd64696d267a -r f5b1f555b73b src/Tools/jEdit/patches/jedit/extended_styles
--- a/src/Tools/jEdit/patches/jedit/extended_styles Thu Sep 05 18:05:03 2013 +0200
+++ b/src/Tools/jEdit/patches/jedit/extended_styles Thu Sep 05 23:14:28 2013 +0200
@@ -1,6 +1,6 @@
-diff -ru 5.0.0/jEdit/org/gjt/sp/jedit/gui/StyleEditor.java 5.0.0/jEdit-patched/org/gjt/sp/jedit/gui/StyleEditor.java
---- 5.0.0/jEdit/org/gjt/sp/jedit/gui/StyleEditor.java 2012-11-17 16:41:58.000000000 +0100
-+++ 5.0.0/jEdit-patched/org/gjt/sp/jedit/gui/StyleEditor.java 2012-12-01 17:34:47.000000000 +0100
+diff -ru 5.1.0/jEdit/org/gjt/sp/jedit/gui/StyleEditor.java 5.1.0/jEdit-patched/org/gjt/sp/jedit/gui/StyleEditor.java
+--- 5.1.0/jEdit/org/gjt/sp/jedit/gui/StyleEditor.java 2013-07-28 19:03:38.000000000 +0200
++++ 5.1.0/jEdit-patched/org/gjt/sp/jedit/gui/StyleEditor.java 2013-09-05 10:51:29.192192327 +0200
@@ -79,7 +79,7 @@
start = next;
token = token.next;
@@ -10,9 +10,9 @@
{
JOptionPane.showMessageDialog(textArea.getView(),
jEdit.getProperty("syntax-style-no-token.message"),
-diff -ru 5.0.0/jEdit/org/gjt/sp/jedit/syntax/Chunk.java 5.0.0/jEdit-patched/org/gjt/sp/jedit/syntax/Chunk.java
---- 5.0.0/jEdit/org/gjt/sp/jedit/syntax/Chunk.java 2012-11-17 16:42:25.000000000 +0100
-+++ 5.0.0/jEdit-patched/org/gjt/sp/jedit/syntax/Chunk.java 2012-12-01 18:28:35.000000000 +0100
+diff -ru 5.1.0/jEdit/org/gjt/sp/jedit/syntax/Chunk.java 5.1.0/jEdit-patched/org/gjt/sp/jedit/syntax/Chunk.java
+--- 5.1.0/jEdit/org/gjt/sp/jedit/syntax/Chunk.java 2013-07-28 19:03:51.000000000 +0200
++++ 5.1.0/jEdit-patched/org/gjt/sp/jedit/syntax/Chunk.java 2013-09-05 10:51:29.192192327 +0200
@@ -256,9 +256,9 @@
//{{{ Package private members
@@ -34,9 +34,9 @@
private GlyphVector[] glyphs;
//}}}
-diff -ru 5.0.0/jEdit/org/gjt/sp/jedit/syntax/Token.java 5.0.0/jEdit-patched/org/gjt/sp/jedit/syntax/Token.java
---- 5.0.0/jEdit/org/gjt/sp/jedit/syntax/Token.java 2012-11-17 16:42:25.000000000 +0100
-+++ 5.0.0/jEdit-patched/org/gjt/sp/jedit/syntax/Token.java 2012-12-01 17:37:04.000000000 +0100
+diff -ru 5.1.0/jEdit/org/gjt/sp/jedit/syntax/Token.java 5.1.0/jEdit-patched/org/gjt/sp/jedit/syntax/Token.java
+--- 5.1.0/jEdit/org/gjt/sp/jedit/syntax/Token.java 2013-07-28 19:03:51.000000000 +0200
++++ 5.1.0/jEdit-patched/org/gjt/sp/jedit/syntax/Token.java 2013-09-05 10:51:29.192192327 +0200
@@ -57,7 +57,7 @@
*/
public static String tokenToString(byte token)
@@ -46,9 +46,9 @@
} //}}}
//{{{ Token types
-diff -ru 5.0.0/jEdit/org/gjt/sp/util/SyntaxUtilities.java 5.0.0/jEdit-patched/org/gjt/sp/util/SyntaxUtilities.java
---- 5.0.0/jEdit/org/gjt/sp/util/SyntaxUtilities.java 2012-11-17 16:42:30.000000000 +0100
-+++ 5.0.0/jEdit-patched/org/gjt/sp/util/SyntaxUtilities.java 2012-12-01 17:40:33.000000000 +0100
+diff -ru 5.1.0/jEdit/org/gjt/sp/util/SyntaxUtilities.java 5.1.0/jEdit-patched/org/gjt/sp/util/SyntaxUtilities.java
+--- 5.1.0/jEdit/org/gjt/sp/util/SyntaxUtilities.java 2013-07-28 19:03:53.000000000 +0200
++++ 5.1.0/jEdit-patched/org/gjt/sp/util/SyntaxUtilities.java 2013-09-05 10:51:29.192192327 +0200
@@ -194,7 +194,24 @@
{
return loadStyles(family,size,true);
@@ -88,10 +88,10 @@
+
private SyntaxUtilities(){}
}
-diff -ru 5.0.0/jEdit/org/gjt/sp/jedit/textarea/TextArea.java 5.0.0/jEdit-patched/org/gjt/sp/jedit/textarea/TextArea.java
---- 5.0.0/jEdit/org/gjt/sp/jedit/textarea/TextArea.java 2012-11-17 16:41:43.000000000 +0100
-+++ 5.0.0/jEdit-patched/org/gjt/sp/jedit/textarea/TextArea.java 2012-12-01 17:28:12.000000000 +0100
-@@ -906,6 +906,11 @@
+diff -ru 5.1.0/jEdit/org/gjt/sp/jedit/textarea/TextArea.java 5.1.0/jEdit-patched/org/gjt/sp/jedit/textarea/TextArea.java
+--- 5.1.0/jEdit/org/gjt/sp/jedit/textarea/TextArea.java 2013-07-28 19:03:32.000000000 +0200
++++ 5.1.0/jEdit-patched/org/gjt/sp/jedit/textarea/TextArea.java 2013-09-05 10:51:29.196192309 +0200
+@@ -907,6 +907,11 @@
return chunkCache.getLineInfo(screenLine).physicalLine;
} //}}}
@@ -103,4 +103,3 @@
//{{{ getScreenLineOfOffset() method
/**
* Returns the screen (wrapped) line containing the specified offset.
-
diff -r dd64696d267a -r f5b1f555b73b src/Tools/jEdit/patches/jedit/macos
--- a/src/Tools/jEdit/patches/jedit/macos Thu Sep 05 18:05:03 2013 +0200
+++ b/src/Tools/jEdit/patches/jedit/macos Thu Sep 05 23:14:28 2013 +0200
@@ -1,43 +1,13 @@
-diff -ru 5.0.0/jEdit/org/gjt/sp/jedit/OperatingSystem.java 5.0.0/jEdit-patched/org/gjt/sp/jedit/OperatingSystem.java
---- 5.0.0/jEdit/org/gjt/sp/jedit/OperatingSystem.java 2012-11-17 16:42:29.000000000 +0100
-+++ 5.0.0/jEdit-patched/org/gjt/sp/jedit/OperatingSystem.java 2012-12-01 17:32:47.000000000 +0100
-@@ -318,6 +318,10 @@
- {
- os = WINDOWS_NT;
- }
-+ else if(osName.contains("Mac OS X"))
-+ {
-+ os = MAC_OS_X;
-+ }
- else if(osName.contains("VMS"))
- {
- os = VMS;
-diff -ru 5.0.0/jEdit/org/gjt/sp/jedit/Debug.java 5.0.0/jEdit-patched/org/gjt/sp/jedit/Debug.java
---- 5.0.0/jEdit/org/gjt/sp/jedit/Debug.java 2012-11-17 16:42:29.000000000 +0100
-+++ 5.0.0/jEdit-patched/org/gjt/sp/jedit/Debug.java 2013-01-04 20:00:25.698332853 +0100
+diff -ru 5.1.0/jEdit/org/gjt/sp/jedit/Debug.java 5.1.0/jEdit-patched/org/gjt/sp/jedit/Debug.java
+--- 5.1.0/jEdit/org/gjt/sp/jedit/Debug.java 2013-07-28 19:03:49.000000000 +0200
++++ 5.1.0/jEdit-patched/org/gjt/sp/jedit/Debug.java 2013-09-05 10:55:36.388181955 +0200
@@ -109,7 +109,7 @@
- * 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 = false;
+ * 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 = false;
- /**
- * If true, A+ shortcuts are disabled. If you use this, you should also
-diff -ru 5.0.0/jEdit/org/gjt/sp/jedit/gui/KeyEventWorkaround.java 5.0.0/jEdit-patched/org/gjt/sp/jed
-it/gui/KeyEventWorkaround.java
---- 5.0.0/jEdit/org/gjt/sp/jedit/gui/KeyEventWorkaround.java 2012-11-17 16:41:58.000000000 +0100
-+++ 5.0.0/jEdit-patched/org/gjt/sp/jedit/gui/KeyEventWorkaround.java 2013-01-04 20:04:43.02632209
-2 +0100
-@@ -297,8 +297,8 @@
-
- if(!Debug.ALTERNATIVE_DISPATCHER)
- {
-- if(((modifiers & InputEvent.CTRL_MASK) != 0
-- ^ (modifiers & InputEvent.ALT_MASK) != 0)
-+ if((modifiers & InputEvent.CTRL_MASK) != 0 && (modifiers & InputEvent.ALT_MASK) == 0
-+ || (modifiers & InputEvent.CTRL_MASK) == 0 && (modifiers & InputEvent.ALT_MASK) != 0 && !Debug.ALT_KEY_PRESSED_DISABLED
- || (modifiers & InputEvent.META_MASK) != 0)
- {
- return null;
+ /**
+ * If true, A+ shortcuts are disabled. If you use this, you should also