diff options
| author | Stefan Kangas <stefankangas@gmail.com> | 2022-08-19 20:19:59 +0200 |
|---|---|---|
| committer | Stefan Kangas <stefankangas@gmail.com> | 2022-08-19 20:36:12 +0200 |
| commit | a936335aa02bd6d142ce61563e6cf70a1a7c271b (patch) | |
| tree | d1dc84297b9b84d698cc130e79b7cbb5681fb031 /test | |
| parent | 935e4da0e1389fd5a8f836ac81dc53d698f4439f (diff) | |
| download | emacs-a936335aa02bd6d142ce61563e6cf70a1a7c271b.tar.gz emacs-a936335aa02bd6d142ce61563e6cf70a1a7c271b.tar.bz2 emacs-a936335aa02bd6d142ce61563e6cf70a1a7c271b.zip | |
Fix return value of help--key-description-fontified
This fixes a bug with warning about obsolete commands in
`command-execute', where we incorrectly showed empty parenthesis
instead of the empty string when there was no keybinding for the new
command.
* lisp/help.el (help--key-description-fontified): Return nil instead
of the empty string if KEYS argument is nil.
* test/lisp/help-tests.el (help--key-description-fontified): New test.
(with-substitute-command-keys-test): Fix indentation.
Diffstat (limited to 'test')
| -rw-r--r-- | test/lisp/help-tests.el | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/test/lisp/help-tests.el b/test/lisp/help-tests.el index 7f30b27b00d..833c32ffb27 100644 --- a/test/lisp/help-tests.el +++ b/test/lisp/help-tests.el @@ -55,18 +55,24 @@ (should (equal (help-split-fundoc nil t 'usage) nil)) (should (equal (help-split-fundoc nil t 'doc) nil)))) +(ert-deftest help--key-description-fontified () + (should (equal (help--key-description-fontified + (where-is-internal #'next-line nil t)) + "C-n")) + (should-not (help--key-description-fontified nil))) + ;;; substitute-command-keys (defmacro with-substitute-command-keys-test (&rest body) `(cl-flet* ((test - (lambda (orig result) - (should (equal (substitute-command-keys orig) - result)))) + (lambda (orig result) + (should (equal (substitute-command-keys orig) + result)))) (test-re - (lambda (orig regexp) - (should (string-match (concat "\\`" regexp "\\'") - (substitute-command-keys orig)))))) + (lambda (orig regexp) + (should (string-match (concat "\\`" regexp "\\'") + (substitute-command-keys orig)))))) ,@body)) (ert-deftest help-tests-substitute-command-keys/no-change () |