# HG changeset patch
# User paulson
# Date 1523984689 -3600
# Node ID ae76012879c600481edd49774089d5bcd9994643
# Parent  927c6f4405db424b8c8d5e2b1a706379b8c9d33a# Parent  6a9d1b31a7c5c209bf50a6134152eca1caa14405
merged

diff -r 6a9d1b31a7c5 -r ae76012879c6 Admin/Windows/Installer/README
--- a/Admin/Windows/Installer/README	Tue Apr 17 12:09:23 2018 +0100
+++ b/Admin/Windows/Installer/README	Tue Apr 17 18:04:49 2018 +0100
@@ -3,9 +3,8 @@
 
 * 7zip: http://www.7-zip.org/
 
-* 7zip self-extracting installer: http://www.7zsfx.info
+* 7zip self-extracting installer: https://github.com/chrislake/7zsfxmm
 
 * final packaging:
 
-  cat 7zsd_All.sfx sfx.txt Isabelle.7z > Isabelle.exe
-
+  cat 7zsd_All_x64.sfx sfx.txt Isabelle.7z > Isabelle.exe
diff -r 6a9d1b31a7c5 -r ae76012879c6 Admin/components/bundled-windows
--- a/Admin/components/bundled-windows	Tue Apr 17 12:09:23 2018 +0100
+++ b/Admin/components/bundled-windows	Tue Apr 17 18:04:49 2018 +0100
@@ -1,3 +1,3 @@
 #additional components to be bundled for release
 cygwin-20170930
-windows_app-20150821
+windows_app-20180417
diff -r 6a9d1b31a7c5 -r ae76012879c6 Admin/components/components.sha1
--- a/Admin/components/components.sha1	Tue Apr 17 12:09:23 2018 +0100
+++ b/Admin/components/components.sha1	Tue Apr 17 18:04:49 2018 +0100
@@ -124,6 +124,7 @@
 c70c5a6c565d435a09a8639f8afd3de360708e1c  jedit_build-20160330.tar.gz
 d4e1496c257659cf15458d718f4663cdd95a404e  jedit_build-20161024.tar.gz
 d806c1c26b571b5b4ef05ea11e8b9cf936518e06  jedit_build-20170319.tar.gz
+7bcb202e13358dd750e964b2f747664428b5d8b3  jedit_build-20180417.tar.gz
 0bd2bc2d9a491ba5fc8dd99df27c04f11a72e8fa  jfreechart-1.0.14-1.tar.gz
 8122526f1fc362ddae1a328bdbc2152853186fee  jfreechart-1.0.14.tar.gz
 c8a19a36adf6cefa779d85f22ded2f4654e68ea5  jortho-1.0-1.tar.gz
@@ -224,10 +225,12 @@
 c368908584e2bca38b3bcb20431d0c69399fc2f0  windows_app-20131130.tar.gz
 c3f5285481a95fde3c1961595b4dd0311ee7ac1f  windows_app-20131201.tar.gz
 14807afcf69e50d49663d5b48f4b103f30ae842b  windows_app-20150821.tar.gz
+ed106181510e825bf959025d8e0a2fc3f78e7a3f  windows_app-20180417.tar.gz
 1c36a840320dfa9bac8af25fc289a4df5ea3eccb  xz-java-1.2-1.tar.gz
 2ae13aa17d0dc95ce254a52f1dba10929763a10d  xz-java-1.2.tar.gz
 c22196148fcace5443a933238216cff5112948df  xz-java-1.5.tar.gz
 4368ee09154dff42666a8c87e072261745619e51  xz-java-1.6.tar.gz
+63f5fa09e92a895cb9aea27d7142abc86c487d25  xz-java-1.8.tar.gz
 4530a1aa6f4498ee3d78d6000fa71a3f63bd077f  yices-1.0.28.tar.gz
 3a8f77822278fe9250890e357248bc678d8fac95  z3-3.2-1.tar.gz
 12ae71acde43bd7bed1e005c43034b208c0cba4c  z3-3.2.tar.gz
diff -r 6a9d1b31a7c5 -r ae76012879c6 Admin/components/main
--- a/Admin/components/main	Tue Apr 17 12:09:23 2018 +0100
+++ b/Admin/components/main	Tue Apr 17 18:04:49 2018 +0100
@@ -6,7 +6,7 @@
 e-2.0-1
 isabelle_fonts-20180113
 jdk-8u162
-jedit_build-20170319
+jedit_build-20180417
 jfreechart-1.0.14-1
 jortho-1.0-2
 kodkodi-1.5.2
@@ -19,5 +19,5 @@
 spass-3.8ds
 sqlite-jdbc-3.20.0
 verit-2016post
-xz-java-1.6
+xz-java-1.8
 z3-4.4.0pre-1
diff -r 6a9d1b31a7c5 -r ae76012879c6 Admin/lib/Tools/makedist_bundle
--- a/Admin/lib/Tools/makedist_bundle	Tue Apr 17 12:09:23 2018 +0100
+++ b/Admin/lib/Tools/makedist_bundle	Tue Apr 17 18:04:49 2018 +0100
@@ -404,7 +404,7 @@
 
       echo "application for $PLATFORM_FAMILY"
       (
-        cat "windows_app/7zsd_All.sfx"
+        cat "windows_app/7zsd_All_x64.sfx"
         cat "$ISABELLE_HOME/Admin/Windows/Installer/sfx.txt" | \
           perl -p -e "s,{ISABELLE_NAME},${ISABELLE_NAME},g;"
         cat "$TMP/${ISABELLE_NAME}.7z"
diff -r 6a9d1b31a7c5 -r ae76012879c6 NEWS
--- a/NEWS	Tue Apr 17 12:09:23 2018 +0100
+++ b/NEWS	Tue Apr 17 18:04:49 2018 +0100
@@ -118,6 +118,8 @@
 symbols remain in literal \<symbol> form. This avoids accidental loss of
 Unicode content when saving the file.
 
+* Update to jedit-5.5.0, the latest release.
+
 
 *** Isabelle/VSCode Prover IDE ***
 
diff -r 6a9d1b31a7c5 -r ae76012879c6 src/Tools/jEdit/lib/Tools/jedit
--- a/src/Tools/jEdit/lib/Tools/jedit	Tue Apr 17 12:09:23 2018 +0100
+++ b/src/Tools/jEdit/lib/Tools/jedit	Tue Apr 17 18:04:49 2018 +0100
@@ -411,12 +411,12 @@
   compile_sources "${SOURCES[@]}"
   make_jar "$TARGET"
 
-  cp "$ISABELLE_JEDIT_BUILD_HOME/doc/jedit5.4.0manual-a4.pdf" dist/doc/jedit-manual.pdf
+  cp "$ISABELLE_JEDIT_BUILD_HOME/doc/jedit5.5.0manual-a4.pdf" dist/doc/jedit-manual.pdf
   cp dist/doc/CHANGES.txt dist/doc/jedit-changes
   cat > dist/doc/Contents <<EOF
 Original jEdit Documentation
-  jedit-manual    jEdit 5.4 User's Guide
-  jedit-changes   jEdit 5.4 Version History
+  jedit-manual    jEdit 5.5 User's Guide
+  jedit-changes   jEdit 5.5 Version History
 
 EOF
 
diff -r 6a9d1b31a7c5 -r ae76012879c6 src/Tools/jEdit/patches/docking
--- a/src/Tools/jEdit/patches/docking	Tue Apr 17 12:09:23 2018 +0100
+++ b/src/Tools/jEdit/patches/docking	Tue Apr 17 18:04:49 2018 +0100
@@ -1,6 +1,6 @@
-diff -ru 5.4.0/jEdit-orig/org/gjt/sp/jedit/gui/FloatingWindowContainer.java 5.4.0/jEdit-patched/org/gjt/sp/jedit/gui/FloatingWindowContainer.java
---- 5.4.0/jEdit-orig/org/gjt/sp/jedit/gui/FloatingWindowContainer.java	2017-03-18 14:30:25.000000000 +0100
-+++ 5.4.0/jEdit-patched/org/gjt/sp/jedit/gui/FloatingWindowContainer.java	2017-03-19 19:27:45.730945687 +0100
+diff -ru 5.5.0/jEdit/org/gjt/sp/jedit/gui/FloatingWindowContainer.java 5.5.0/jEdit-patched/org/gjt/sp/jedit/gui/FloatingWindowContainer.java
+--- 5.5.0/jEdit/org/gjt/sp/jedit/gui/FloatingWindowContainer.java	2018-04-09 01:56:46.000000000 +0200
++++ 5.5.0/jEdit-patched/org/gjt/sp/jedit/gui/FloatingWindowContainer.java	2018-04-17 13:57:40.320348370 +0200
 @@ -35,7 +35,7 @@
  import javax.swing.Box;
  import javax.swing.BoxLayout;
diff -r 6a9d1b31a7c5 -r ae76012879c6 src/Tools/jEdit/patches/extended_styles
--- a/src/Tools/jEdit/patches/extended_styles	Tue Apr 17 12:09:23 2018 +0100
+++ b/src/Tools/jEdit/patches/extended_styles	Tue Apr 17 18:04:49 2018 +0100
@@ -1,7 +1,7 @@
-diff -ru 5.4.0/jEdit-orig/org/gjt/sp/jedit/syntax/Chunk.java 5.4.0/jEdit-patched/org/gjt/sp/jedit/syntax/Chunk.java
---- 5.4.0/jEdit-orig/org/gjt/sp/jedit/syntax/Chunk.java	2017-03-18 14:30:28.000000000 +0100
-+++ 5.4.0/jEdit-patched/org/gjt/sp/jedit/syntax/Chunk.java	2017-03-19 19:27:45.730945687 +0100
-@@ -259,9 +259,9 @@
+diff -ru 5.5.0/jEdit/org/gjt/sp/jedit/syntax/Chunk.java 5.5.0/jEdit-patched/org/gjt/sp/jedit/syntax/Chunk.java
+--- 5.5.0/jEdit/org/gjt/sp/jedit/syntax/Chunk.java	2018-04-09 01:57:24.000000000 +0200
++++ 5.5.0/jEdit-patched/org/gjt/sp/jedit/syntax/Chunk.java	2018-04-17 13:58:12.912465088 +0200
+@@ -322,9 +322,9 @@
  	//{{{ Package private members
  
  	//{{{ Instance variables
@@ -13,7 +13,7 @@
  	//}}}
  
  	//{{{ Chunk constructor
-@@ -509,7 +509,7 @@
+@@ -572,7 +572,7 @@
  	// this is either style.getBackgroundColor() or
  	// styles[defaultID].getBackgroundColor()
  	private Color background;
@@ -22,9 +22,9 @@
  	private GlyphVector[] glyphs;
  	//}}}
  
-diff -ru 5.4.0/jEdit-orig/org/gjt/sp/jedit/textarea/TextArea.java 5.4.0/jEdit-patched/org/gjt/sp/jedit/textarea/TextArea.java
---- 5.4.0/jEdit-orig/org/gjt/sp/jedit/textarea/TextArea.java	2017-03-18 14:30:28.000000000 +0100
-+++ 5.4.0/jEdit-patched/org/gjt/sp/jedit/textarea/TextArea.java	2017-03-19 19:27:45.734945702 +0100
+diff -ru 5.5.0/jEdit/org/gjt/sp/jedit/textarea/TextArea.java 5.5.0/jEdit-patched/org/gjt/sp/jedit/textarea/TextArea.java
+--- 5.5.0/jEdit/org/gjt/sp/jedit/textarea/TextArea.java	2018-04-09 01:58:01.000000000 +0200
++++ 5.5.0/jEdit-patched/org/gjt/sp/jedit/textarea/TextArea.java	2018-04-17 13:58:12.912465088 +0200
 @@ -917,6 +917,11 @@
  		return chunkCache.getLineInfo(screenLine).physicalLine;
  	} //}}}
@@ -37,10 +37,9 @@
  	//{{{ getScreenLineOfOffset() method
  	/**
  	 * Returns the screen (wrapped) line containing the specified offset.
-Only in 5.4.0/jEdit-patched/org/gjt/sp/jedit/textarea: TextArea.java.orig
-diff -ru 5.4.0/jEdit-orig/org/gjt/sp/util/SyntaxUtilities.java 5.4.0/jEdit-patched/org/gjt/sp/util/SyntaxUtilities.java
---- 5.4.0/jEdit-orig/org/gjt/sp/util/SyntaxUtilities.java	2017-03-18 14:30:34.000000000 +0100
-+++ 5.4.0/jEdit-patched/org/gjt/sp/util/SyntaxUtilities.java	2017-03-19 19:27:45.734945702 +0100
+diff -ru 5.5.0/jEdit/org/gjt/sp/util/SyntaxUtilities.java 5.5.0/jEdit-patched/org/gjt/sp/util/SyntaxUtilities.java
+--- 5.5.0/jEdit/org/gjt/sp/util/SyntaxUtilities.java	2018-04-09 01:58:37.000000000 +0200
++++ 5.5.0/jEdit-patched/org/gjt/sp/util/SyntaxUtilities.java	2018-04-17 13:58:12.912465088 +0200
 @@ -200,7 +200,24 @@
  	{
  		return loadStyles(family,size,true);
diff -r 6a9d1b31a7c5 -r ae76012879c6 src/Tools/jEdit/patches/folding
--- a/src/Tools/jEdit/patches/folding	Tue Apr 17 12:09:23 2018 +0100
+++ b/src/Tools/jEdit/patches/folding	Tue Apr 17 18:04:49 2018 +0100
@@ -1,7 +1,7 @@
-diff -ru 5.4.0/jEdit-orig/org/gjt/sp/jedit/buffer/JEditBuffer.java 5.4.0/jEdit-patched/org/gjt/sp/jedit/buffer/JEditBuffer.java
---- 5.4.0/jEdit-orig/org/gjt/sp/jedit/buffer/JEditBuffer.java	2017-03-18 14:30:28.000000000 +0100
-+++ 5.4.0/jEdit-patched/org/gjt/sp/jedit/buffer/JEditBuffer.java	2017-03-19 19:27:45.734945702 +0100
-@@ -1950,29 +1950,23 @@
+diff -ru 5.5.0/jEdit/org/gjt/sp/jedit/buffer/JEditBuffer.java 5.5.0/jEdit-patched/org/gjt/sp/jedit/buffer/JEditBuffer.java
+--- 5.5.0/jEdit/org/gjt/sp/jedit/buffer/JEditBuffer.java	2018-04-09 01:57:06.000000000 +0200
++++ 5.5.0/jEdit-patched/org/gjt/sp/jedit/buffer/JEditBuffer.java	2018-04-17 13:58:42.984572359 +0200
+@@ -1961,29 +1961,23 @@
  			{
  				Segment seg = new Segment();
  				newFoldLevel = foldHandler.getFoldLevel(this,i,seg);
diff -r 6a9d1b31a7c5 -r ae76012879c6 src/Tools/jEdit/patches/props
--- a/src/Tools/jEdit/patches/props	Tue Apr 17 12:09:23 2018 +0100
+++ b/src/Tools/jEdit/patches/props	Tue Apr 17 18:04:49 2018 +0100
@@ -1,7 +1,7 @@
-diff -ru 5.4.0/jEdit-orig/org/jedit/localization/jedit_en.props 5.4.0/jEdit-patched/org/jedit/localization/jedit_en.props
---- 5.4.0/jEdit-orig/org/jedit/localization/jedit_en.props	2017-03-18 14:30:24.000000000 +0100
-+++ 5.4.0/jEdit-patched/org/jedit/localization/jedit_en.props	2017-03-19 19:35:49.728895954 +0100
-@@ -1262,8 +1262,7 @@
+diff -ru 5.5.0/jEdit/org/jedit/localization/jedit_en.props 5.5.0/jEdit-patched/org/jedit/localization/jedit_en.props
+--- 5.5.0/jEdit/org/jedit/localization/jedit_en.props	2018-04-09 01:58:42.000000000 +0200
++++ 5.5.0/jEdit-patched/org/jedit/localization/jedit_en.props	2018-04-17 13:59:10.688670850 +0200
+@@ -1270,8 +1270,7 @@
  	The most likely reason is that the JAR file is corrupt; try\n\
  	reinstalling it. See Utilities->Troubleshooting->Activity Log\n\
  	for a full stack trace.