Fix "C-u" when an input method is active

* lisp/international/quail.el (quail-input-method): Defer to the
input method iff 'overriding-terminal-local-map' is
'universal-argument-map' and the given key has no binding there.
(Bug#22958)

diff --git a/lisp/international/quail.el b/lisp/international/quail.el
index f5e390278ca00e759277184d69598ff6a44dd94d..320d783d4108065c8442f4c21fed87aeb4cbd836 100644 (file)
--- a/lisp/international/quail.el
+++ b/lisp/international/quail.el
@@ -1333,7 +1333,15 @@ If STR has `advice' text property, append the following special event:
 
 (defun quail-input-method (key)
   (if (or buffer-read-only
-         overriding-terminal-local-map
+         (and overriding-terminal-local-map
+               ;; If the overriding map is `universal-argument-map', that
+               ;; must mean the user has pressed 'C-u KEY'.  If KEY has a
+               ;; binding in `universal-argument-map' just return
+               ;; (list KEY), otherwise act as if there was no
+               ;; overriding map.
+               (or (not (eq (cadr overriding-terminal-local-map)
+                            universal-argument-map))
+                   (lookup-key overriding-terminal-local-map (vector key))))
          overriding-local-map)
       (list key)
     (quail-setup-overlays (quail-conversion-keymap))