branch: externals/compat
commit d709cb6adc857667cd4392ec4db965ce96a3f68e
Author: Daniel Mendler <[email protected]>
Commit: Daniel Mendler <[email protected]>
compat-tests: Test keymap-set
---
compat-29.el | 2 +-
compat-tests.el | 21 ++++++++++++++++-----
2 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/compat-29.el b/compat-29.el
index a92ce4e08d..abb9346530 100644
--- a/compat-29.el
+++ b/compat-29.el
@@ -572,7 +572,7 @@ See `kbd' for a descripion of KEYS."
(setq res (vconcat res key))))))
res)))
-(compat-defun keymap-set (keymap key definition) ;; <UNTESTED>
+(compat-defun keymap-set (keymap key definition) ;; <OK>
"Set KEY to DEFINITION in KEYMAP.
KEY is a string that satisfies `key-valid-p'.
diff --git a/compat-tests.el b/compat-tests.el
index 854525ab46..1a1f1cbddd 100644
--- a/compat-tests.el
+++ b/compat-tests.el
@@ -211,19 +211,30 @@
(define-key map (kbd "C-x C-f") #'find-file)
(define-key map (kbd "SPC") #'minibuffer-complete-word)
(define-key map (kbd "C-c") mode-specific-map)
+ (define-key map (kbd "s-c") [?\C-c ?\C-c])
map))
-(defvar-keymap compat-tests--map-2
+(defvar compat-tests--map-2
+ (let ((map (make-sparse-keymap)))
+ (keymap-set map "C-x C-f" #'find-file)
+ (keymap-set map "SPC" #'minibuffer-complete-word)
+ (keymap-set map "C-c" mode-specific-map)
+ (keymap-set map "s-c" "C-c C-c")
+ map))
+(defvar-keymap compat-tests--map-3
"C-x C-f" #'find-file
"SPC" #'minibuffer-complete-word
- "C-c" mode-specific-map)
-(defvar compat-tests--map-3
+ "C-c" mode-specific-map
+ "s-c" "C-c C-c")
+(defvar compat-tests--map-4
(define-keymap
"C-x C-f" #'find-file
"SPC" #'minibuffer-complete-word
- "C-c" mode-specific-map))
+ "C-c" mode-specific-map
+ "s-c" "C-c C-c"))
(ert-deftest defvar-keymap ()
(should-equal compat-tests--map-1 compat-tests--map-2)
- (should-equal compat-tests--map-1 compat-tests--map-3))
+ (should-equal compat-tests--map-1 compat-tests--map-3)
+ (should-equal compat-tests--map-1 compat-tests--map-4))
(ert-deftest key-parse ()
(should-equal (key-parse "f") [?f])
