# HG changeset patch
# User wenzelm
# Date 1523969335 -7200
# Node ID 752a4e6d760c67eb0189bdc2f4e8e8550e027a11
# Parent  53ab458395a89d68066f6f13373428a55f437e0f
updated to jedit-5.5.0;
discontinued jedit_build/contrib/jEdit-patched.tar.gz -- its content is in directory jedit_build/contrib/jedit-5.5.0-patched/jEdit;

diff -r 53ab458395a8 -r 752a4e6d760c Admin/components/components.sha1
--- a/Admin/components/components.sha1	Tue Apr 17 10:22:42 2018 +0100
+++ b/Admin/components/components.sha1	Tue Apr 17 14:48:55 2018 +0200
@@ -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
diff -r 53ab458395a8 -r 752a4e6d760c Admin/components/main
--- a/Admin/components/main	Tue Apr 17 10:22:42 2018 +0100
+++ b/Admin/components/main	Tue Apr 17 14:48:55 2018 +0200
@@ -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
diff -r 53ab458395a8 -r 752a4e6d760c src/Tools/jEdit/lib/Tools/jedit
--- a/src/Tools/jEdit/lib/Tools/jedit	Tue Apr 17 10:22:42 2018 +0100
+++ b/src/Tools/jEdit/lib/Tools/jedit	Tue Apr 17 14:48:55 2018 +0200
@@ -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 53ab458395a8 -r 752a4e6d760c src/Tools/jEdit/patches/docking
--- a/src/Tools/jEdit/patches/docking	Tue Apr 17 10:22:42 2018 +0100
+++ b/src/Tools/jEdit/patches/docking	Tue Apr 17 14:48:55 2018 +0200
@@ -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 53ab458395a8 -r 752a4e6d760c src/Tools/jEdit/patches/extended_styles
--- a/src/Tools/jEdit/patches/extended_styles	Tue Apr 17 10:22:42 2018 +0100
+++ b/src/Tools/jEdit/patches/extended_styles	Tue Apr 17 14:48:55 2018 +0200
@@ -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 53ab458395a8 -r 752a4e6d760c src/Tools/jEdit/patches/folding
--- a/src/Tools/jEdit/patches/folding	Tue Apr 17 10:22:42 2018 +0100
+++ b/src/Tools/jEdit/patches/folding	Tue Apr 17 14:48:55 2018 +0200
@@ -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 53ab458395a8 -r 752a4e6d760c src/Tools/jEdit/patches/props
--- a/src/Tools/jEdit/patches/props	Tue Apr 17 10:22:42 2018 +0100
+++ b/src/Tools/jEdit/patches/props	Tue Apr 17 14:48:55 2018 +0200
@@ -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.