[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master fb9326b 3/3: Say which command shadows a key binding
From: |
Stefan Kangas |
Subject: |
master fb9326b 3/3: Say which command shadows a key binding |
Date: |
Sat, 21 Nov 2020 21:19:10 -0500 (EST) |
branch: master
commit fb9326b45c769f83b619278eae41f680577d1b05
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>
Say which command shadows a key binding
* src/keymap.c (describe_vector): Say which command shadows this
binding. (Bug#9293)
* test/src/keymap-tests.el
(help--describe-vector/bug-9293-one-shadowed-in-range): Adapt
test.
---
src/keymap.c | 8 +++++++-
test/src/keymap-tests.el | 6 +++---
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/keymap.c b/src/keymap.c
index aaba2ac..e22eb41 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -3223,7 +3223,13 @@ describe_vector (Lisp_Object vector, Lisp_Object prefix,
Lisp_Object args,
if (this_shadowed)
{
SET_PT (PT - 1);
- insert_string (" (binding currently shadowed)");
+ static char const fmt[] = " (currently shadowed by `%s')";
+ USE_SAFE_ALLOCA;
+ char *buffer = SAFE_ALLOCA (sizeof fmt +
+ SBYTES (SYMBOL_NAME (shadowed_by)));
+ esprintf (buffer, fmt, SDATA (SYMBOL_NAME (shadowed_by)));
+ insert_string (buffer);
+ SAFE_FREE();
SET_PT (PT + 1);
}
}
diff --git a/test/src/keymap-tests.el b/test/src/keymap-tests.el
index e467b1f..6411cd1 100644
--- a/test/src/keymap-tests.el
+++ b/test/src/keymap-tests.el
@@ -58,7 +58,6 @@
(let* (menu-item-filter-ran
(object `(menu-item "2" identity
:filter ,(lambda (cmd)
- (message "foo")
(setq menu-item-filter-ran t)
cmd))))
(keymap--get-keyelt object t)
@@ -213,14 +212,15 @@ commit 86c19714b097aa477d339ed99ffb5136c755a046."
map))
(shadow-map (let ((map (make-keymap)))
(define-key map "f" 'bar)
- map)))
+ map))
+ (text-quoting-style 'grave))
(with-temp-buffer
(help--describe-vector (cadr orig-map) nil #'help--describe-command
t shadow-map orig-map t)
(should (equal (buffer-string)
"
e foo
-f foo (binding currently shadowed)
+f foo (currently shadowed by `bar')
g .. h foo
")))))