# HG changeset patch # User wenzelm # Date 1380118887 -7200 # Node ID 44da1f830715123f20f57fc8f69fdfb1df7d1cbf # Parent b65b4e70a258bc53890258bc6bee37048c85b6a6# Parent 48d13465c7c7c1680e7fd1a57c19a325fb0e157d merged diff -r b65b4e70a258 -r 44da1f830715 Admin/components/components.sha1 --- a/Admin/components/components.sha1 Wed Sep 25 15:49:15 2013 +0200 +++ b/Admin/components/components.sha1 Wed Sep 25 16:21:27 2013 +0200 @@ -36,6 +36,7 @@ c85c0829b8170f25aa65ec6852f505ce2a50639b jedit_build-20130628.tar.gz 5de3e399be2507f684b49dfd13da45228214bbe4 jedit_build-20130905.tar.gz 87136818fd5528d97288f5b06bd30c787229eb0d jedit_build-20130910.tar.gz +c63189cbe39eb8104235a0928f579d9523de78a9 jedit_build-20130925.tar.gz 0bd2bc2d9a491ba5fc8dd99df27c04f11a72e8fa jfreechart-1.0.14-1.tar.gz 8122526f1fc362ddae1a328bdbc2152853186fee jfreechart-1.0.14.tar.gz 6c737137cc597fc920943783382e928ea79e3feb kodkodi-1.2.16.tar.gz diff -r b65b4e70a258 -r 44da1f830715 Admin/components/main --- a/Admin/components/main Wed Sep 25 15:49:15 2013 +0200 +++ b/Admin/components/main Wed Sep 25 16:21:27 2013 +0200 @@ -4,7 +4,7 @@ exec_process-1.0.3 Haskabelle-2013 jdk-7u40 -jedit_build-20130910 +jedit_build-20130925 jfreechart-1.0.14-1 kodkodi-1.5.2 polyml-5.5.1 diff -r b65b4e70a258 -r 44da1f830715 Admin/lib/Tools/makedist_bundle --- a/Admin/lib/Tools/makedist_bundle Wed Sep 25 15:49:15 2013 +0200 +++ b/Admin/lib/Tools/makedist_bundle Wed Sep 25 16:21:27 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 b65b4e70a258 -r 44da1f830715 src/Tools/jEdit/etc/options --- a/src/Tools/jEdit/etc/options Wed Sep 25 15:49:15 2013 +0200 +++ b/src/Tools/jEdit/etc/options Wed Sep 25 16:21:27 2013 +0200 @@ -30,10 +30,10 @@ public option jedit_symbols_search_limit : int = 50 -- "maximum number of symbols in search result" -public option jedit_macos_application : bool = true +option jedit_macos_application : bool = false -- "some native Mac OS X application support (potential conflict with MacOSX plugin)" -public option jedit_macos_preferences : bool = false +option jedit_macos_preferences : bool = false -- "native Mac OS X preferences menu" public option jedit_timing_threshold : real = 0.1 diff -r b65b4e70a258 -r 44da1f830715 src/Tools/jEdit/lib/Tools/jedit --- a/src/Tools/jEdit/lib/Tools/jedit Wed Sep 25 15:49:15 2013 +0200 +++ b/src/Tools/jEdit/lib/Tools/jedit Wed Sep 25 16:21:27 2013 +0200 @@ -206,9 +206,8 @@ "$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/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" ) diff -r b65b4e70a258 -r 44da1f830715 src/Tools/jEdit/src/jEdit.props --- a/src/Tools/jEdit/src/jEdit.props Wed Sep 25 15:49:15 2013 +0200 +++ b/src/Tools/jEdit/src/jEdit.props Wed Sep 25 16:21:27 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 diff -r b65b4e70a258 -r 44da1f830715 src/Tools/jEdit/src/plugin.scala --- a/src/Tools/jEdit/src/plugin.scala Wed Sep 25 15:49:15 2013 +0200 +++ b/src/Tools/jEdit/src/plugin.scala Wed Sep 25 16:21:27 2013 +0200 @@ -325,7 +325,7 @@ PIDE.options.update(Options.init()) PIDE.completion_history.load() - if (Platform.is_macos) OSX_Adapter.init + // FIXME if (Platform.is_macos) OSX_Adapter.init SyntaxUtilities.setStyleExtender(new Token_Markup.Style_Extender) if (ModeProvider.instance.isInstanceOf[ModeProvider])