1 files changed, 4 insertions, 1 deletions

diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index 69d4d933d02..894f2f70216 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -286,7 +286,10 @@ wrong, use this command again to toggle back to the right mode."
                   (format "Command to execute with %s:" coding-system)))
          (cmd (key-binding keyseq))
          prefix)
-
+    ;; read-key-sequence ignores quit, so make an explicit check.
+    ;; Like many places, this assumes quit == C-g, but it need not be.
+    (if (char-equal last-input-char ?\C-g)
+        (keyboard-quit))
     (when (memq cmd '(universal-argument digit-argument))
       (call-interactively cmd)