branch: externals/ergoemacs-mode
commit 4e5dfc6c084ee6c638e72a1eab2fc220c8952839
Author: Walter Landry <wlan...@caltech.edu>
Commit: Walter Landry <wlan...@caltech.edu>
Turn off caching in ergoemacs-map--composed-list
It causes infinite loops in mu4e for reasons that are hard to figure
out.
---
ergoemacs-map.el | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/ergoemacs-map.el b/ergoemacs-map.el
index 4c5505a..d699c92 100644
--- a/ergoemacs-map.el
+++ b/ergoemacs-map.el
@@ -396,8 +396,8 @@ It takes the following arguments:
(unless (ergoemacs lookup-keymap :installed-p)
(let ((ret (make-sparse-keymap))
tmp composed-list local-unbind-list bound-keys i key2)
- (ergoemacs-cache (and lookup-key (intern (format "%s-%s-composed-key"
lookup-key
- (ergoemacs
lookup-keymap :map-key))))
+ ;; 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
@@ -436,7 +436,7 @@ It takes the following arguments:
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))))))
+ (list composed-list local-unbind-list ret)))))
(defun ergoemacs-map--puthash (key new &optional table)
"Associate KEY with a list including NEW in TABLE."
