merge trunk

1 files changed, 6 insertions, 1 deletions

diff --git a/lisp/repeat.el b/lisp/repeat.el
index eddaf4f020e..86484ec68d6 100644
--- a/lisp/repeat.el
+++ b/lisp/repeat.el
@@ -335,7 +335,12 @@ recently executed command not bound to an input event\"."
         (setq real-last-command 'repeat)
         (setq repeat-undo-count 1)
         (unwind-protect
-            (while (eq (read-event) repeat-repeat-char)
+            (while (let ((evt (read-event))) ;FIXME: read-key maybe?
+                     ;; For clicks, we need to strip the meta-data to
+                     ;; check the underlying event name.
+                     (eq (or (car-safe evt) evt)
+                         (or (car-safe repeat-repeat-char)
+                             repeat-repeat-char)))
               (repeat repeat-arg))
           ;; Make sure `repeat-undo-count' is reset.
           (setq repeat-undo-count nil))