mlf176f2 pushed a commit to branch externals/ergoemacs-mode in repository elpa.
commit e26c523fdc8af03639ca0144e9331e438ffbb9d6 Author: Matthew L. Fidler <[email protected]> Date: Fri May 23 20:57:04 2014 +0800 no-ergoemacs-advice -> ergoemacs-ignore-advice --- ergoemacs-advices.el | 5 +++-- ergoemacs-modal.el | 2 +- ergoemacs-theme-engine.el | 6 +++--- ergoemacs-translate.el | 10 +++++----- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/ergoemacs-advices.el b/ergoemacs-advices.el index 64b0125..6ec2ea7 100644 --- a/ergoemacs-advices.el +++ b/ergoemacs-advices.el @@ -91,13 +91,14 @@ Also adds keymap-flag for user-defined keys run with `run-mode-hooks'." (defvar ergoemacs-global-override-rm-keys '()) ;;; Advices enabled or disabled with ergoemacs-mode +(defvar ergoemacs-ignore-advice nil) (defun ergoemacs-global-set-key-after (key) - (if (and (boundp 'no-ergoemacs-advice) no-ergoemacs-advice) nil + (if ergoemacs-ignore-advice nil (unless (or (and (vectorp key) (memq (elt key 0) '(menu-bar 27 remap))) (and (not (vectorp key)) (string= "ESC" (key-description key)))) - (let ((no-ergoemacs-advice t)) + (let ((ergoemacs-ignore-advice t)) (add-to-list 'ergoemacs-global-changed-cache (key-description key)) (when ergoemacs-global-not-changed-cache (delete (key-description key) ergoemacs-global-not-changed-cache)) diff --git a/ergoemacs-modal.el b/ergoemacs-modal.el index 978145a..eef348f 100644 --- a/ergoemacs-modal.el +++ b/ergoemacs-modal.el @@ -389,7 +389,7 @@ Typically function keys") keymap (type type) tmp - (no-ergoemacs-advice t)) + (ergoemacs-ignore-advice t)) (setq ergoemacs-emulation-mode-map-alist (delq x ergoemacs-emulation-mode-map-alist)) (cond diff --git a/ergoemacs-theme-engine.el b/ergoemacs-theme-engine.el index 55883ec..81cd836 100644 --- a/ergoemacs-theme-engine.el +++ b/ergoemacs-theme-engine.el @@ -607,7 +607,7 @@ When fixed-layout and variable-layout are bound" (defun ergoemacs-theme-component--ignore-globally-defined-key (key) "Adds KEY to `ergoemacs-global-override-rm-keys' and `ergoemacs-global-override-map' if globally redefined." - (let ((no-ergoemacs-advice t) + (let ((ergoemacs-ignore-advice t) (key (read-kbd-macro (key-description key) t)) lk) (catch 'found-global-command (while (>= (length key) 1) @@ -1125,7 +1125,7 @@ Returns list of: read-keymap shortcut-keymap keymap shortcut-list unbind-keymap fixed-rm variable-rm rm-lst key-list - (no-ergoemacs-advice t) + (ergoemacs-ignore-advice t) (case-fold-search t) key trans-key input-keys @@ -2095,7 +2095,7 @@ Returns list of: read-keymap shortcut-keymap keymap shortcut-list unbind-keymap Uses `ergoemacs-theme-component-keymaps' and `ergoemacs-theme-components'" (let* ((ret (ergoemacs-theme-component-keymaps (ergoemacs-theme-components theme) version)) (menu-keymap (make-sparse-keymap)) - (no-ergoemacs-advice t) + (ergoemacs-ignore-advice t) prior keys) (push (pop ret) prior) (push (pop ret) prior) diff --git a/ergoemacs-translate.el b/ergoemacs-translate.el index 7873f90..1120313 100644 --- a/ergoemacs-translate.el +++ b/ergoemacs-translate.el @@ -489,7 +489,7 @@ This function is made in `ergoemacs-translation' and calls `ergoemacs-modal-togg (ergoemacs-translation :name 'normal :keymap (let ((map (make-sparse-keymap)) - (no-ergoemacs-advice t)) + (ergoemacs-ignore-advice t)) (define-key map [f1] 'ergoemacs-read-key-help) (define-key map (read-kbd-macro "C-h") 'ergoemacs-read-key-help) map)) @@ -502,7 +502,7 @@ This function is made in `ergoemacs-translation' and calls `ergoemacs-modal-togg :modal-color "blue" :modal-always t :keymap (let ((map (make-sparse-keymap)) - (no-ergoemacs-advice t)) + (ergoemacs-ignore-advice t)) (define-key map [f1] 'ergoemacs-read-key-help) (define-key map (read-kbd-macro "M-h") 'ergoemacs-read-key-help) (define-key map (if (eq system-type 'windows-nt) [M-apps] [M-menu]) 'ergoemacs-read-key-next-key-is-quoted) @@ -520,7 +520,7 @@ This function is made in `ergoemacs-translation' and calls `ergoemacs-modal-togg :alt "" :ctl "M-" :keymap (let ((map (make-sparse-keymap)) - (no-ergoemacs-advice t)) + (ergoemacs-ignore-advice t)) (define-key map [f1] 'ergoemacs-read-key-help) (define-key map (read-kbd-macro "SPC") 'ergoemacs-read-key-next-key-is-quoted) (define-key map (read-kbd-macro "M-SPC") 'ergoemacs-read-key-next-key-is-alt-ctl) @@ -536,7 +536,7 @@ This function is made in `ergoemacs-translation' and calls `ergoemacs-modal-togg :alt "M-S-" :modal-color "red" :keymap-modal (let ((map (make-sparse-keymap)) - (no-ergoemacs-advice t)) + (ergoemacs-ignore-advice t)) (define-key map (read-kbd-macro "<return>") 'ergoemacs-unchorded-alt-modal) (define-key map (read-kbd-macro "RET") 'ergoemacs-unchorded-alt-modal) map)) @@ -558,7 +558,7 @@ This function is made in `ergoemacs-translation' and calls `ergoemacs-modal-togg map) :keymap-modal (let ((map (make-sparse-keymap)) - (no-ergoemacs-advice t)) + (ergoemacs-ignore-advice t)) (define-key map (read-kbd-macro "1") 'ergoemacs-gaia-digit-argument) (define-key map (read-kbd-macro "2") 'ergoemacs-gaia-digit-argument) (define-key map (read-kbd-macro "3") 'ergoemacs-gaia-digit-argument)
