Merge from origin/emacs-28

e632b83a28 Update authors.el for Emacs 28
e9fdb11903 ; * ChangeLog.3: Some additional fixes.
8fa4749df1 ; * ChangeLog.3: Filename fixes.
ea5a90b4f4 * lisp/repeat.el: Fix long-standing problem when a random ...
ef4954b69c * lisp/repeat.el (repeat-keep-prefix): Change default to nil.
6d5886e780 * test/lisp/repeat-tests.el (repeat-tests-call-b): Test fo...
9e16c6a96d ; * src/comp.c (syms_of_comp) <comp-no-native-file-h>: Doc...
9aa8fd6e62 * src/callint.c (Fcall_interactively): Fix inhibit_mouse_e...
70c229b1fc Fix regression in gdb-frame-handler
cd9dd26d24 Format and index concept 'predicate' in ELisp Intro
ab291656d0 ; * ChangeLog.3: Fix typos.
354f6c5609 ; * ChangeLog.3: Formatting fixes.
6192525a96 ; make change-history-commit

1 files changed, 35 insertions, 1 deletions

diff --git a/test/lisp/repeat-tests.el b/test/lisp/repeat-tests.el
index a1f9bbb1739..02d9ddbc96e 100644
--- a/test/lisp/repeat-tests.el
+++ b/test/lisp/repeat-tests.el
@@ -37,6 +37,8 @@
 (defvar repeat-tests-map
   (let ((map (make-sparse-keymap)))
     (define-key map (kbd "C-x w a") 'repeat-tests-call-a)
+    (define-key map (kbd "M-C-a") 'repeat-tests-call-a)
+    (define-key map (kbd "M-C-z") 'repeat-tests-call-a)
     map)
   "Keymap for keys that initiate repeating sequences.")
 
@@ -47,7 +49,7 @@
     map)
   "Keymap for repeating sequences.")
 (put 'repeat-tests-call-a 'repeat-map 'repeat-tests-repeat-map)
-(put 'repeat-tests-call-b 'repeat-map 'repeat-tests-repeat-map)
+(put 'repeat-tests-call-b 'repeat-map repeat-tests-repeat-map)
 
 (defmacro with-repeat-mode (&rest body)
   "Create environment for testing `repeat-mode'."
@@ -70,6 +72,38 @@
   ;; Check for self-inserting keys
   (should (equal (buffer-string) inserted)))
 
+(ert-deftest repeat-tests-check-key ()
+  (with-repeat-mode
+   (let ((repeat-echo-function 'ignore))
+     (let ((repeat-check-key t))
+       (repeat-tests--check
+        "C-x w a b a c"
+        '((1 a) (1 b) (1 a)) "c")
+       (repeat-tests--check
+        "M-C-a b a c"
+        '((1 a) (1 b) (1 a)) "c")
+       (repeat-tests--check
+        "M-C-z b a c"
+        '((1 a)) "bac")
+       (unwind-protect
+           (progn
+             (put 'repeat-tests-call-a 'repeat-check-key 'no)
+             (repeat-tests--check
+              "M-C-z b a c"
+              '((1 a) (1 b) (1 a)) "c"))
+         (put 'repeat-tests-call-a 'repeat-check-key nil)))
+     (let ((repeat-check-key nil))
+       (repeat-tests--check
+        "M-C-z b a c"
+        '((1 a) (1 b) (1 a)) "c")
+       (unwind-protect
+           (progn
+             (put 'repeat-tests-call-a 'repeat-check-key t)
+             (repeat-tests--check
+              "M-C-z b a c"
+              '((1 a)) "bac"))
+         (put 'repeat-tests-call-a 'repeat-check-key nil))))))
+
 (ert-deftest repeat-tests-exit-key ()
   (with-repeat-mode
    (let ((repeat-echo-function 'ignore))