# HG changeset patch # User wenzelm # Date 1380224350 -7200 # Node ID 7924d61b50cf45d00332a846733caf09f83f7bdf # Parent f19be93909f11af1f2992aebee02633042002edd workaround for action-bar shortcut on Mac OS X L&F: avoid EnhancedMenuItem.setAccelerator which causes conflict with regular key handling and thus double invocation -- see also jEdit.actionContext (if actionBarVisible view.removeToolBar); diff -r f19be93909f1 -r 7924d61b50cf Admin/lib/Tools/makedist_bundle --- a/Admin/lib/Tools/makedist_bundle Thu Sep 26 16:42:18 2013 +0200 +++ b/Admin/lib/Tools/makedist_bundle Thu Sep 26 21:39:10 2013 +0200 @@ -170,6 +170,7 @@ mv "$ISABELLE_TARGET/contrib/macos_app" "$TMP/." perl -pi \ + -e "s,action-bar.shortcut=.*,action-bar.shortcut2=,g;" \ -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;" \ diff -r f19be93909f1 -r 7924d61b50cf src/Tools/jEdit/src/jEdit.props --- a/src/Tools/jEdit/src/jEdit.props Thu Sep 26 16:42:18 2013 +0200 +++ b/src/Tools/jEdit/src/jEdit.props Thu Sep 26 21:39:10 2013 +0200 @@ -1,4 +1,5 @@ #jEdit properties +action-bar.shortcut=C+ENTER buffer.deepIndent=false buffer.encoding=UTF-8-Isabelle buffer.indentSize=2