mlf176f2 pushed a commit to branch externals/ergoemacs-mode in repository elpa.
commit 009f7ca4d33ba7569a85c008b0b361a833c97d34 Author: Matthew L. Fidler <[email protected]> Date: Thu Jun 19 13:05:08 2014 -0500 Fix Issue #231 --- ergoemacs-mode.el | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ergoemacs-mode.el b/ergoemacs-mode.el index 63c878d..c9a12d7 100644 --- a/ergoemacs-mode.el +++ b/ergoemacs-mode.el @@ -452,10 +452,10 @@ bindings the keymap is: (ergoemacs-debug-heading "Ergoemacs Keys have loaded.") (when (and ergoemacs-use-mac-command-as-meta (eq system-type 'darwin)) - (let ((cm (or (intern-soft "ns-command-modifier") - (intern-soft "mac-command-modifier"))) - (am (or (intern-soft "ns-alternate-modifier") - (intern-soft "mac-alternate-modifier")))) + (let ((cm (or (and (boundp 'ns-command-modifier) 'ns-command-modifier) + (and (boundp 'mac-command-modifier) 'mac-command-modifier))) + (am (or (and (boundp 'ns-alternate-modifier) 'ns-alternate-modifier) + (and (boundp 'mac-alternate-modifier) 'mac-alternate-modifier)))) (when cm (setq ergoemacs-old-ns-command-modifier (symbol-value cm)) (set cm 'meta)) @@ -504,10 +504,10 @@ bindings the keymap is: (when (featurep 'ergoemacs-menus) (ergoemacs-menus-off)) (when (and ergoemacs-use-mac-command-as-meta (eq system-type 'darwin)) - (let ((cm (or (intern-soft "ns-command-modifier") - (intern-soft "mac-command-modifier"))) - (am (or (intern-soft "ns-alternate-modifier") - (intern-soft "mac-alternate-modifier")))) + (let ((cm (or (and (boundp 'ns-command-modifier) 'ns-command-modifier) + (and (boundp 'mac-command-modifier) 'mac-command-modifier))) + (am (or (and (boundp 'ns-alternate-modifier) 'ns-alternate-modifier) + (and (boundp 'mac-alternate-modifier) 'mac-alternate-modifier)))) (when cm (set cm ergoemacs-old-ns-command-modifier)) (when am
