# HG changeset patch
# User wenzelm
# Date 1380117940 -7200
# Node ID 48d13465c7c7c1680e7fd1a57c19a325fb0e157d
# Parent  f1c5f857df3d065cd8fce855b279a6ccb560f385
bypass Isabelle OSX_Adapter for now -- MacOSX plugin 1.3 manages that better;

diff -r f1c5f857df3d -r 48d13465c7c7 src/Tools/jEdit/etc/options
--- a/src/Tools/jEdit/etc/options	Wed Sep 25 15:40:34 2013 +0200
+++ b/src/Tools/jEdit/etc/options	Wed Sep 25 16:05:40 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 f1c5f857df3d -r 48d13465c7c7 src/Tools/jEdit/src/plugin.scala
--- a/src/Tools/jEdit/src/plugin.scala	Wed Sep 25 15:40:34 2013 +0200
+++ b/src/Tools/jEdit/src/plugin.scala	Wed Sep 25 16:05:40 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])