[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/ergoemacs-mode addfd4c 156/325: Use ergoemacs-override-
From: |
Stefan Monnier |
Subject: |
[elpa] externals/ergoemacs-mode addfd4c 156/325: Use ergoemacs-override-keymap instead of a local keymap |
Date: |
Sat, 23 Oct 2021 18:48:43 -0400 (EDT) |
branch: externals/ergoemacs-mode
commit addfd4c0f9a1e21e2a668a7a32328c584f358bbb
Author: Walter Landry <wlandry@caltech.edu>
Commit: Walter Landry <wlandry@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)
- [elpa] externals/ergoemacs-mode 7ce34ce 086/325: Remove some M-C-* entries in term-raw-map., (continued)
- [elpa] externals/ergoemacs-mode 7ce34ce 086/325: Remove some M-C-* entries in term-raw-map., Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode 3690135 077/325: Remove more shift translation, Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode 1c84bf1 090/325: Reindent, Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode b928611 071/325: Remove keyfreq, Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode 88ecca1 117/325: Cleanup and remove <next>, <pause>, <prior>, <mouse> bindings, Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode cdfb329 134/325: Install calc bindings with a regular function, Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode 61218ba 138/325: Remove multiple-cursors and avy, Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode 0640576 161/325: Menu work, Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode 45688c2 164/325: Add better binding for Fill menu, Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode 3fcd06c 163/325: Fix interrupting isearch with a regular command, Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode addfd4c 156/325: Use ergoemacs-override-keymap instead of a local keymap,
Stefan Monnier <=
- [elpa] externals/ergoemacs-mode 35897ad 159/325: Fix menus so that "Open Recent" works, Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode 27e8a09 167/325: Remove more macros, Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode f6aac16 172/325: Remove unused ergoemacs-command-loop, Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode b6ad133 178/325: Remove M-O-fight test. It fails, but the keys work with manual tests, Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode 6c909f3 185/325: Remove the shutdown hook, Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode 615ec31 186/325: Really remove the startup and shutdown hooks, Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode d475686 187/325: Remove require stuff, Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode 209e00f 189/325: Fix a test, Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode c484389 201/325: Lots of tweaks to the help svg, Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode 7553908 215/325: Remove set-layout, Stefan Monnier, 2021/10/23