# HG changeset patch
# User wenzelm
# Date 1439216090 -7200
# Node ID 8d00ff5a052e011f67a5fe618992a3dfe48e8378
# Parent  52edced9cce584452d9502788debbf47b9f1ab23
sort lines;

diff -r 52edced9cce5 -r 8d00ff5a052e src/Tools/jEdit/src/jEdit.props
--- a/src/Tools/jEdit/src/jEdit.props	Mon Aug 10 16:05:41 2015 +0200
+++ b/src/Tools/jEdit/src/jEdit.props	Mon Aug 10 16:14:50 2015 +0200
@@ -22,11 +22,12 @@
 encoding.opt-out.COMPOUND_TEXT=true
 encoding.opt-out.EUC-JP=true
 encoding.opt-out.EUC-KR=true
+encoding.opt-out.GB2312=true
 encoding.opt-out.GB18030=true
-encoding.opt-out.GB2312=true
 encoding.opt-out.GBK=true
 encoding.opt-out.IBM-Thai=true
 encoding.opt-out.IBM00858=true
+encoding.opt-out.IBM037=true
 encoding.opt-out.IBM01140=true
 encoding.opt-out.IBM01141=true
 encoding.opt-out.IBM01142=true
@@ -37,9 +38,6 @@
 encoding.opt-out.IBM01147=true
 encoding.opt-out.IBM01148=true
 encoding.opt-out.IBM01149=true
-encoding.opt-out.IBM037=true
-encoding.opt-out.IBM1026=true
-encoding.opt-out.IBM1047=true
 encoding.opt-out.IBM273=true
 encoding.opt-out.IBM277=true
 encoding.opt-out.IBM278=true
@@ -68,11 +66,12 @@
 encoding.opt-out.IBM870=true
 encoding.opt-out.IBM871=true
 encoding.opt-out.IBM918=true
+encoding.opt-out.IBM1026=true
+encoding.opt-out.IBM1047=true
 encoding.opt-out.ISO-2022-CN=true
 encoding.opt-out.ISO-2022-JP-2=true
 encoding.opt-out.ISO-2022-JP=true
 encoding.opt-out.ISO-2022-KR=true
-encoding.opt-out.ISO-8859-13=true
 encoding.opt-out.ISO-8859-2=true
 encoding.opt-out.ISO-8859-3=true
 encoding.opt-out.ISO-8859-4=true
@@ -81,6 +80,7 @@
 encoding.opt-out.ISO-8859-7=true
 encoding.opt-out.ISO-8859-8=true
 encoding.opt-out.ISO-8859-9=true
+encoding.opt-out.ISO-8859-13=true
 encoding.opt-out.JIS_X0201=true
 encoding.opt-out.JIS_X0212-1990=true
 encoding.opt-out.KOI8-R=true
@@ -95,6 +95,7 @@
 encoding.opt-out.UTF-32LE=true
 encoding.opt-out.X-UTF-32BE-BOM=true
 encoding.opt-out.X-UTF-32LE-BOM=true
+encoding.opt-out.windows-31j=true
 encoding.opt-out.windows-1250=true
 encoding.opt-out.windows-1251=true
 encoding.opt-out.windows-1253=true
@@ -103,21 +104,8 @@
 encoding.opt-out.windows-1256=true
 encoding.opt-out.windows-1257=true
 encoding.opt-out.windows-1258=true
-encoding.opt-out.windows-31j=true
 encoding.opt-out.x-Big5-Solaris=true
 encoding.opt-out.x-EUC-TW=true
-encoding.opt-out.x-IBM1006=true
-encoding.opt-out.x-IBM1025=true
-encoding.opt-out.x-IBM1046=true
-encoding.opt-out.x-IBM1097=true
-encoding.opt-out.x-IBM1098=true
-encoding.opt-out.x-IBM1112=true
-encoding.opt-out.x-IBM1122=true
-encoding.opt-out.x-IBM1123=true
-encoding.opt-out.x-IBM1124=true
-encoding.opt-out.x-IBM1381=true
-encoding.opt-out.x-IBM1383=true
-encoding.opt-out.x-IBM33722=true
 encoding.opt-out.x-IBM737=true
 encoding.opt-out.x-IBM834=true
 encoding.opt-out.x-IBM856=true
@@ -140,6 +128,18 @@
 encoding.opt-out.x-IBM950=true
 encoding.opt-out.x-IBM964=true
 encoding.opt-out.x-IBM970=true
+encoding.opt-out.x-IBM1006=true
+encoding.opt-out.x-IBM1025=true
+encoding.opt-out.x-IBM1046=true
+encoding.opt-out.x-IBM1097=true
+encoding.opt-out.x-IBM1098=true
+encoding.opt-out.x-IBM1112=true
+encoding.opt-out.x-IBM1122=true
+encoding.opt-out.x-IBM1123=true
+encoding.opt-out.x-IBM1124=true
+encoding.opt-out.x-IBM1381=true
+encoding.opt-out.x-IBM1383=true
+encoding.opt-out.x-IBM33722=true
 encoding.opt-out.x-ISCII91=true
 encoding.opt-out.x-ISO-2022-CN-CNS=true
 encoding.opt-out.x-ISO-2022-CN-GB=true
@@ -169,11 +169,11 @@
 encoding.opt-out.x-eucJP-Open=true
 encoding.opt-out.x-iso-8859-11=true
 encoding.opt-out.x-mswin-936=true
-encoding.opt-out.x-windows-50220=true
-encoding.opt-out.x-windows-50221=true
 encoding.opt-out.x-windows-874=true
 encoding.opt-out.x-windows-949=true
 encoding.opt-out.x-windows-950=true
+encoding.opt-out.x-windows-50220=true
+encoding.opt-out.x-windows-50221=true
 encoding.opt-out.x-windows-iso2022jp=true
 encodingDetectors=BOM XML-PI buffer-local-property
 end.shortcut=
@@ -195,9 +195,9 @@
 isabelle-sledgehammer.dock-position=bottom
 isabelle-symbols.dock-position=bottom
 isabelle-theories.dock-position=right
+isabelle.complete-word.label=Complete word
 isabelle.complete.label=Complete Isabelle text
 isabelle.complete.shortcut2=C+b
-isabelle.complete-word.label=Complete word
 isabelle.control-bold.label=Control bold
 isabelle.control-bold.shortcut=C+e RIGHT
 isabelle.control-reset.label=Control reset
@@ -210,20 +210,20 @@
 isabelle.decrease-font-size.shortcut2=C+SUBTRACT
 isabelle.decrease-font-size.shortcut=C+MINUS
 isabelle.decrease-font-size2.label=Decrease font size (clone)
+isabelle.exclude-word-permanently.label=Exclude word permanently
+isabelle.exclude-word.label=Exclude word
+isabelle.include-word-permanently.label=Include word permanently
+isabelle.include-word.label=Include word
 isabelle.increase-font-size.label=Increase font size
 isabelle.increase-font-size.shortcut2=C+ADD
 isabelle.increase-font-size.shortcut=C+PLUS
 isabelle.increase-font-size2.label=Increase font size (clone)
 isabelle.increase-font-size2.shortcut=C+EQUALS
-isabelle.include-word.label=Include word
-isabelle.include-word-permanently.label=Include word permanently
-isabelle.exclude-word.label=Exclude word
-isabelle.exclude-word-permanently.label=Exclude word permanently
 isabelle.options.label=Isabelle options
-isabelle.reset-words.label=Reset non-permanent words
 isabelle.reset-continuous-checking.label=Reset continuous checking
 isabelle.reset-font-size.label=Reset font size
 isabelle.reset-node-required.label=Reset node required
+isabelle.reset-words.label=Reset non-permanent words
 isabelle.set-continuous-checking.label=Set continuous checking
 isabelle.set-node-required.label=Set node required
 isabelle.toggle-continuous-checking.label=Toggle continuous checking
@@ -266,10 +266,10 @@
 toggle-rect-select.shortcut2=A+NUMBER_SIGN
 twoStageSave=false
 vfs.browser.dock-position=floating
+vfs.favorite.0.type=1
 vfs.favorite.0=$ISABELLE_HOME
-vfs.favorite.0.type=1
+vfs.favorite.1.type=1
 vfs.favorite.1=$ISABELLE_HOME_USER
-vfs.favorite.1.type=1
 view.antiAlias=standard
 view.blockCaret=true
 view.caretBlink=false