[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
feature/completions-highlight-modifications f12bfdc 6/9: Fix recursive s
From: |
Jimmy Aguilar Mena |
Subject: |
feature/completions-highlight-modifications f12bfdc 6/9: Fix recursive set-keymap-parent in completions-highlight. |
Date: |
Sun, 15 Nov 2020 01:27:16 -0500 (EST) |
branch: feature/completions-highlight-modifications
commit f12bfdcd2b26faea0d5359590070dba4a9f300aa
Author: Jimmy Aguilar Mena <spacibba@aol.com>
Commit: Jimmy Aguilar Mena <spacibba@aol.com>
Fix recursive set-keymap-parent in completions-highlight.
*
lisp/completions-highlight.el (completions-highlight-minibuffer-bindings)
:
(completions-highlight-completions-bindings) : Condition
set-keymap-parent to avoid error.
---
lisp/completions-highlight.el | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/lisp/completions-highlight.el b/lisp/completions-highlight.el
index a16e4f9..00b7382 100644
--- a/lisp/completions-highlight.el
+++ b/lisp/completions-highlight.el
@@ -211,9 +211,12 @@ suffix."
When SET is nil the bindings are removed."
(if set
(let ((local-map (current-local-map)))
- (setq completions-highlight-minibuffer-map-save local-map)
- (set-keymap-parent completions-highlight-minibuffer-map local-map)
- (use-local-map completions-highlight-minibuffer-map))
+ (unless (eq local-map completions-highlight-minibuffer-map)
+ (setq completions-highlight-minibuffer-map-save local-map)
+ (unless (eq local-map
+ (keymap-parent completions-highlight-minibuffer-map))
+ (set-keymap-parent completions-highlight-minibuffer-map local-map))
+ (use-local-map completions-highlight-minibuffer-map)))
(use-local-map completions-highlight-minibuffer-map-save)))
@@ -222,11 +225,11 @@ When SET is nil the bindings are removed."
"Add extra keybindings to `completion-list-mode-map'.
When SET is nil the bindings are removed."
(if set
- (unless (keymap-parent completions-highlight-completions-map)
(let ((local-map (current-local-map)))
- (setq completions-highlight-completions-map-save local-map)
- (set-keymap-parent completions-highlight-completions-map local-map)
- (use-local-map completions-highlight-completions-map)))
+ (unless (eq local-map completions-highlight-completions-map)
+ (setq completions-highlight-completions-map-save local-map)
+ (set-keymap-parent completions-highlight-completions-map local-map)
+ (use-local-map completions-highlight-completions-map)))
;; Set is called already inside *Completions* but unset not
(when-let ((parent (keymap-parent completions-highlight-completions-map))
- branch feature/completions-highlight-modifications created (now ede71d0), Jimmy Aguilar Mena, 2020/11/15
- feature/completions-highlight-modifications 2344367 1/9: Insert some modifications to implement completions highlighting., Jimmy Aguilar Mena, 2020/11/15
- feature/completions-highlight-modifications ecc7901 8/9: Simplify numeric argument, Jimmy Aguilar Mena, 2020/11/15
- feature/completions-highlight-modifications e558c57 5/9: Improve keymap handling., Jimmy Aguilar Mena, 2020/11/15
- feature/completions-highlight-modifications 65d1038 3/9: Add completions-highlight-mode initial implementation., Jimmy Aguilar Mena, 2020/11/15
- feature/completions-highlight-modifications 9ac4a61 7/9: Fix corner case when going out of bounds, Jimmy Aguilar Mena, 2020/11/15
- feature/completions-highlight-modifications 09520f7 4/9: Fix initial comment in completions-highlight file., Jimmy Aguilar Mena, 2020/11/15
- feature/completions-highlight-modifications 094ed4b 2/9: Document the changes in the API for Completions., Jimmy Aguilar Mena, 2020/11/15
- feature/completions-highlight-modifications f12bfdc 6/9: Fix recursive set-keymap-parent in completions-highlight.,
Jimmy Aguilar Mena <=
- feature/completions-highlight-modifications ede71d0 9/9: Simplify setting keymaps., Jimmy Aguilar Mena, 2020/11/15