[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/ergoemacs-mode 1c84bf1 090/325: Reindent
From: |
Stefan Monnier |
Subject: |
[elpa] externals/ergoemacs-mode 1c84bf1 090/325: Reindent |
Date: |
Sat, 23 Oct 2021 18:48:28 -0400 (EDT) |
branch: externals/ergoemacs-mode
commit 1c84bf185f9cd44fcb72eec97db4e4c49b547bda
Author: Walter Landry <wlandry@caltech.edu>
Commit: Walter Landry <wlandry@caltech.edu>
Reindent
---
ergoemacs-map.el | 78 ++++++++++++++++++++++++++++----------------------------
1 file changed, 39 insertions(+), 39 deletions(-)
diff --git a/ergoemacs-map.el b/ergoemacs-map.el
index d699c92..24f560a 100644
--- a/ergoemacs-map.el
+++ b/ergoemacs-map.el
@@ -398,45 +398,45 @@ It takes the following arguments:
tmp composed-list local-unbind-list bound-keys i key2)
;; This used to have caching. It causes infinite loops in
;; mu4e for reasons that are hard to figure out.
- (unless only-modify-p
- (ergoemacs-timing lookup-keymap
- (ergoemacs-map-keymap
- (lambda(key item)
- (unless (or (eq item 'ergoemacs-prefix)
- (consp key)
- (memq item ergoemacs-remap-ignore))
- (let ((key (vconcat key)))
- ;; What are the keys that are changed.
- (when (setq tmp (ergoemacs-gethash key
ergoemacs-map--lookup-hash))
- (dolist (new-key tmp)
- ;; (if (and (boundp 'isearch-mode-map) (eq
lookup-keymap isearch-mode-map))
- ;; (message "Define %s->%s" (key-description
new-key) item))
- ;; Don't use (ergoemacs :define-key), since list
contains all variants.
- (ergoemacs :define-key ret new-key item)
- (push new-key bound-keys)))
- ;; Keys where `ergoemacs-mode' dominates
- (setq i (length key))
- (when (and (catch 'found-key
- (while (> i 0)
- (when (setq tmp (ergoemacs-gethash (setq
key2 (substring key 0 i)) ergoemacs-map--))
- (throw 'found-key t))
- (setq i (- i 1))) nil)
- (not (member key2 bound-keys))
- (not (member key2
ergoemacs-map--unbound-keys)))
- (if (not use-local-unbind-list-p)
- (ergoemacs :define-key ret key2 tmp)
- (ergoemacs :apply-key key2
- (lambda (trans-key)
- (unless (member trans-key
local-unbind-list)
- (push trans-key local-unbind-list))))))
- ;; Define ergoemacs-mode remapping
- ;; lookups.
- (when (setq tmp (ergoemacs-gethash key (ergoemacs
global-map :lookup)))
- (ergoemacs :define-key ret (vector 'ergoemacs-remap
tmp) item)))))
- lookup-keymap))
- (ergoemacs ret :label (list (ergoemacs lookup-keymap :key-hash)
'ergoemacs-mode (intern ergoemacs-keyboard-layout))))
- (setq tmp (ergoemacs-component-struct--lookup-list lookup-keymap)
composed-list (or (and ret (or (and tmp (append tmp (list ret))) (list ret)))
tmp))
- (list composed-list local-unbind-list ret)))))
+ (unless only-modify-p
+ (ergoemacs-timing lookup-keymap
+ (ergoemacs-map-keymap
+ (lambda(key item)
+ (unless (or (eq item 'ergoemacs-prefix)
+ (consp key)
+ (memq item ergoemacs-remap-ignore))
+ (let ((key (vconcat key)))
+ ;; What are the keys that are changed.
+ (when (setq tmp (ergoemacs-gethash key
ergoemacs-map--lookup-hash))
+ (dolist (new-key tmp)
+ ;; (if (and (boundp 'isearch-mode-map) (eq
lookup-keymap isearch-mode-map))
+ ;; (message "Define %s->%s" (key-description
new-key) item))
+ ;; Don't use (ergoemacs :define-key), since list
contains all variants.
+ (ergoemacs :define-key ret new-key item)
+ (push new-key bound-keys)))
+ ;; Keys where `ergoemacs-mode' dominates
+ (setq i (length key))
+ (when (and (catch 'found-key
+ (while (> i 0)
+ (when (setq tmp (ergoemacs-gethash (setq
key2 (substring key 0 i)) ergoemacs-map--))
+ (throw 'found-key t))
+ (setq i (- i 1))) nil)
+ (not (member key2 bound-keys))
+ (not (member key2 ergoemacs-map--unbound-keys)))
+ (if (not use-local-unbind-list-p)
+ (ergoemacs :define-key ret key2 tmp)
+ (ergoemacs :apply-key key2
+ (lambda (trans-key)
+ (unless (member trans-key
local-unbind-list)
+ (push trans-key local-unbind-list))))))
+ ;; Define ergoemacs-mode remapping
+ ;; lookups.
+ (when (setq tmp (ergoemacs-gethash key (ergoemacs
global-map :lookup)))
+ (ergoemacs :define-key ret (vector 'ergoemacs-remap tmp)
item)))))
+ lookup-keymap))
+ (ergoemacs ret :label (list (ergoemacs lookup-keymap :key-hash)
'ergoemacs-mode (intern ergoemacs-keyboard-layout))))
+ (setq tmp (ergoemacs-component-struct--lookup-list lookup-keymap)
composed-list (or (and ret (or (and tmp (append tmp (list ret))) (list ret)))
tmp))
+ (list composed-list local-unbind-list ret)))))
(defun ergoemacs-map--puthash (key new &optional table)
"Associate KEY with a list including NEW in TABLE."
- [elpa] externals/ergoemacs-mode 160e94b 009/325: Remove unused easymenu, (continued)
- [elpa] externals/ergoemacs-mode 160e94b 009/325: Remove unused easymenu, Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode a6c1ca2 028/325: Remove dead code, Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode 7851e51 031/325: Remove more package stuff, Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode 270e6b7 041/325: Remove all of :modal, Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode 4b850f2 060/325: Remove dead code and useless message, Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode 58ac535 061/325: Remove obsolete names, Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode 8f6a50e 053/325: Cleanup, Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode d84c00c 065/325: Add missing requires for ibuffer, Stefan Monnier, 2021/10/23
- [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 <=
- [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, 2021/10/23
- [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