[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
feature/completions-highlight-modifications 42f47e7 06/25: Fix recursive
From: |
Jimmy Aguilar Mena |
Subject: |
feature/completions-highlight-modifications 42f47e7 06/25: Fix recursive set-keymap-parent in completions-highlight. |
Date: |
Fri, 20 Nov 2020 13:28:32 -0500 (EST) |
branch: feature/completions-highlight-modifications
commit 42f47e75689919f8337bb142d1ed2f91dc4b4334
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))
- feature/completions-highlight-modifications 25f23b1 25/25: Add try to close completions more often like zsh., (continued)
- feature/completions-highlight-modifications 25f23b1 25/25: Add try to close completions more often like zsh., Jimmy Aguilar Mena, 2020/11/20
- feature/completions-highlight-modifications 5cf9dd6 11/25: Add autoload decorator., Jimmy Aguilar Mena, 2020/11/20
- feature/completions-highlight-modifications 6cea893 07/25: Fix corner case when going out of bounds, Jimmy Aguilar Mena, 2020/11/20
- feature/completions-highlight-modifications e143246 10/25: Simplify overlay handling, Jimmy Aguilar Mena, 2020/11/20
- feature/completions-highlight-modifications ab1e2e6 15/25: Add custom variable completions-highlight-autoselect., Jimmy Aguilar Mena, 2020/11/20
- feature/completions-highlight-modifications 10359ba 19/25: Fix previous commit, Jimmy Aguilar Mena, 2020/11/20
- feature/completions-highlight-modifications bfb8a71 21/25: Add ignore-errors when executing from minibuffer, Jimmy Aguilar Mena, 2020/11/20
- feature/completions-highlight-modifications 3319dcc 22/25: New command minibuffer-choose-completion, Jimmy Aguilar Mena, 2020/11/20
- feature/completions-highlight-modifications 6369e59 23/25: Other changes:, Jimmy Aguilar Mena, 2020/11/20
- feature/completions-highlight-modifications c990a28 24/25: Simplify and add custom, Jimmy Aguilar Mena, 2020/11/20
- feature/completions-highlight-modifications 42f47e7 06/25: Fix recursive set-keymap-parent in completions-highlight.,
Jimmy Aguilar Mena <=
- feature/completions-highlight-modifications 644d5e5 08/25: Simplify numeric argument, Jimmy Aguilar Mena, 2020/11/20
- feature/completions-highlight-modifications 268170e 16/25: Define completions-highlight face and group, Jimmy Aguilar Mena, 2020/11/20