From a31bfd594523dc06941ceb89cdbeabcd4a5d19f7 Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Fri, 8 Jan 2021 15:26:02 +0100 Subject: [PATCH] Merge recently added kbd tests MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit * test/lisp/subr-tests.el (subr--kbd): Merge test... (subr-test-kbd): ...with this one. Fix thinko in my previous commit. Thanks to Mattias Engdegård . --- test/lisp/subr-tests.el | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/test/lisp/subr-tests.el b/test/lisp/subr-tests.el index 83031c44fcd..21185303360 100644 --- a/test/lisp/subr-tests.el +++ b/test/lisp/subr-tests.el @@ -66,9 +66,15 @@ (ert-deftest subr-test-kbd () (should (equal (kbd "f") "f")) - (should (equal (kbd "F1") "F1")) + (should (equal (kbd "") [f1])) (should (equal (kbd "RET") "\C-m")) - (should (equal (kbd "C-x a") "\C-xa"))) + (should (equal (kbd "C-x a") "\C-xa")) + ;; Check that kbd handles both new and old style key descriptions + ;; (bug#45536). + (should (equal (kbd "s-") [s-return])) + (should (equal (kbd "") [s-return])) + (should (equal (kbd "C-M-") [C-M-return])) + (should (equal (kbd "") [C-M-return]))) (ert-deftest subr-test-define-prefix-command () (define-prefix-command 'foo-prefix-map) @@ -653,13 +659,5 @@ See https://debbugs.gnu.org/cgi/bugreport.cgi?bug=19350." (should (>= (length (apropos-internal "^help" #'commandp)) 15)) (should-not (apropos-internal "^next-line$" #'keymapp))) -(ert-deftest subr--kbd () - ;; Check that kbd handles both new and old style key descriptions - ;; (bug#45536). - (should (equal (kbd "s-") [s-return])) - (should (equal (kbd "") [s-return])) - (should (equal (kbd "C-M-") [C-M-return])) - (should (equal (kbd "") [C-M-return]))) - (provide 'subr-tests) ;;; subr-tests.el ends here -- 2.39.2