diff options
Diffstat (limited to 'test/lisp/subr-tests.el')
| -rw-r--r-- | test/lisp/subr-tests.el | 18 |
1 files 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>") [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-<return>") [s-return])) + (should (equal (kbd "<s-return>") [s-return])) + (should (equal (kbd "C-M-<return>") [C-M-return])) + (should (equal (kbd "<C-M-return>") [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-<return>") [s-return])) - (should (equal (kbd "<s-return>") [s-return])) - (should (equal (kbd "C-M-<return>") [C-M-return])) - (should (equal (kbd "<C-M-return>") [C-M-return]))) - (provide 'subr-tests) ;;; subr-tests.el ends here |