# HG changeset patch
# User wenzelm
# Date 1380116434 -7200
# Node ID f1c5f857df3d065cd8fce855b279a6ccb560f385
# Parent  da57c4912987b410b5771636eac2bd172128d71c
include MacOSX plugin by default -- disabled by default to avoid multiplatform confusion;

diff -r da57c4912987 -r f1c5f857df3d Admin/lib/Tools/makedist_bundle
--- a/Admin/lib/Tools/makedist_bundle	Wed Sep 25 15:26:19 2013 +0200
+++ b/Admin/lib/Tools/makedist_bundle	Wed Sep 25 15:40:34 2013 +0200
@@ -171,9 +171,11 @@
     purge_contrib '-name "x86*-linux" -o -name "x86*-cygwin" -o -name "x86*-windows"'
     mv "$ISABELLE_TARGET/contrib/macos_app" "$TMP/."
 
-    perl -pi -e "s,lookAndFeel=.*,lookAndFeel=com.apple.laf.AquaLookAndFeel,g;" \
+    perl -pi \
+      -e "s,lookAndFeel=.*,lookAndFeel=com.apple.laf.AquaLookAndFeel,g;" \
       -e "s,delete-line.shortcut=.*,delete-line.shortcut=C+d,g;" \
       -e "s,delete.shortcut2=.*,delete.shortcut2=A+d,g;" \
+      -e "s,plugin-blacklist.MacOSX.jar=true,plugin-blacklist.MacOSX.jar=,g;" \
       "$ISABELLE_TARGET/src/Tools/jEdit/dist/properties/jEdit.props"
     ;;
   windows)
diff -r da57c4912987 -r f1c5f857df3d src/Tools/jEdit/lib/Tools/jedit
--- a/src/Tools/jEdit/lib/Tools/jedit	Wed Sep 25 15:26:19 2013 +0200
+++ b/src/Tools/jEdit/lib/Tools/jedit	Wed Sep 25 15:40:34 2013 +0200
@@ -206,6 +206,7 @@
   "$ISABELLE_JEDIT_BUILD_HOME/contrib/Console.jar"
   "$ISABELLE_JEDIT_BUILD_HOME/contrib/ErrorList.jar"
   "$ISABELLE_JEDIT_BUILD_HOME/contrib/Highlight.jar"
+  "$ISABELLE_JEDIT_BUILD_HOME/contrib/MacOSX.jar"
   "$ISABELLE_JEDIT_BUILD_HOME/contrib/SideKick.jar"
   "$ISABELLE_JEDIT_BUILD_HOME/contrib/idea-icons.jar"
   "$ISABELLE_JEDIT_BUILD_HOME/contrib/jsr305-2.0.0.jar"
diff -r da57c4912987 -r f1c5f857df3d src/Tools/jEdit/src/jEdit.props
--- a/src/Tools/jEdit/src/jEdit.props	Wed Sep 25 15:26:19 2013 +0200
+++ b/src/Tools/jEdit/src/jEdit.props	Wed Sep 25 15:40:34 2013 +0200
@@ -225,6 +225,7 @@
 lookAndFeel=javax.swing.plaf.nimbus.NimbusLookAndFeel
 match-bracket.shortcut2=C+9
 next-bracket.shortcut2=C+e C+9
+plugin-blacklist.MacOSX.jar=true
 plugin.MacOSXPlugin.altDispatcher=false
 plugin.MacOSXPlugin.disableOption=true
 prev-bracket.shortcut2=C+e C+8