emacs-elpa-diffs
[Top][All Lists]
Advanced

[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."



reply via email to

[Prev in Thread] Current Thread [Next in Thread]