branch: externals/ergoemacs-mode
commit addfd4c0f9a1e21e2a668a7a32328c584f358bbb
Author: Walter Landry <wlan...@caltech.edu>
Commit: Walter Landry <wlan...@caltech.edu>
Use ergoemacs-override-keymap instead of a local keymap
This allows people to customize the overrides.
---
ergoemacs-mode.el | 2 +-
ergoemacs-themes.el | 42 ++++++++++++++++++++----------------------
2 files changed, 21 insertions(+), 23 deletions(-)
diff --git a/ergoemacs-mode.el b/ergoemacs-mode.el
index 1affb80..da56d9f 100644
--- a/ergoemacs-mode.el
+++ b/ergoemacs-mode.el
@@ -681,7 +681,7 @@ SYMBOL is the symbol to set, NEW-VALUE is it's value."
(defun ergoemacs-setup-override-keymap ()
"Setup `ergoemacs-mode' overriding keymap `ergoemacs-override-keymap'."
- ;; (setq ergoemacs-override-alist `((ergoemacs-mode . ,(ergoemacs
ergoemacs-override-keymap))))
+ (setq ergoemacs-override-alist `((ergoemacs-mode . ,(ergoemacs
ergoemacs-override-keymap))))
(add-hook 'emulation-mode-map-alists 'ergoemacs-override-alist))
(defun ergoemacs-remove-override-keymap ()
diff --git a/ergoemacs-themes.el b/ergoemacs-themes.el
index 5b6c1b6..18392b6 100644
--- a/ergoemacs-themes.el
+++ b/ergoemacs-themes.el
@@ -1096,33 +1096,31 @@ calling any other ergoemacs-set-* function"
)
(defvar ergoemacs-override-alist)
+(defvar ergoemacs-override-keymap)
(defun ergoemacs-install-standard-theme ()
(ergoemacs-unset-keys)
(ergoemacs-set-standard-vars)
- (let ((override-keymap (make-sparse-keymap)))
- (ergoemacs-set-standard-fixed override-keymap)
- (ergoemacs-set-help override-keymap)
- (ergoemacs-set-move-char override-keymap)
- (ergoemacs-set-move-buffer override-keymap)
- (ergoemacs-set-move-bracket override-keymap)
- (ergoemacs-set-move-word override-keymap)
- (ergoemacs-set-move-paragraph override-keymap)
- (ergoemacs-set-move-line override-keymap)
- (ergoemacs-set-move-page override-keymap)
- (ergoemacs-set-move-buffer override-keymap)
- (ergoemacs-set-move-bracket override-keymap)
- (ergoemacs-set-copy override-keymap)
- (ergoemacs-set-search override-keymap)
- (ergoemacs-set-switch override-keymap)
- (ergoemacs-set-execute override-keymap)
- (ergoemacs-set-misc override-keymap)
- (ergoemacs-set-kill-line override-keymap)
- (ergoemacs-set-text-transform override-keymap)
- (ergoemacs-set-select-items override-keymap)
- (setq ergoemacs-override-alist `((ergoemacs-mode . ,override-keymap)))
- )
+ (ergoemacs-set-standard-fixed ergoemacs-override-keymap)
+ (ergoemacs-set-help ergoemacs-override-keymap)
+ (ergoemacs-set-move-char ergoemacs-override-keymap)
+ (ergoemacs-set-move-buffer ergoemacs-override-keymap)
+ (ergoemacs-set-move-bracket ergoemacs-override-keymap)
+ (ergoemacs-set-move-word ergoemacs-override-keymap)
+ (ergoemacs-set-move-paragraph ergoemacs-override-keymap)
+ (ergoemacs-set-move-line ergoemacs-override-keymap)
+ (ergoemacs-set-move-page ergoemacs-override-keymap)
+ (ergoemacs-set-move-buffer ergoemacs-override-keymap)
+ (ergoemacs-set-move-bracket ergoemacs-override-keymap)
+ (ergoemacs-set-copy ergoemacs-override-keymap)
+ (ergoemacs-set-search ergoemacs-override-keymap)
+ (ergoemacs-set-switch ergoemacs-override-keymap)
+ (ergoemacs-set-execute ergoemacs-override-keymap)
+ (ergoemacs-set-misc ergoemacs-override-keymap)
+ (ergoemacs-set-kill-line ergoemacs-override-keymap)
+ (ergoemacs-set-text-transform ergoemacs-override-keymap)
+ (ergoemacs-set-select-items ergoemacs-override-keymap)
(ergoemacs-set-remaps)
(ergoemacs-set-quit)
