emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] master c27bd46: * lisp/international/mule-cmds.el (univers


From: Michael Albinus
Subject: [Emacs-diffs] master c27bd46: * lisp/international/mule-cmds.el (universal-coding-system-argument):
Date: Sat, 4 Aug 2018 11:27:03 -0400 (EDT)

branch: master
commit c27bd469f1a6f962798caaa584c36ccbe5e42936
Author: Michael Albinus <address@hidden>
Commit: Michael Albinus <address@hidden>

    * lisp/international/mule-cmds.el (universal-coding-system-argument):
    
    Use `current-input-mode' for determining quit char.
---
 lisp/international/mule-cmds.el | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index cf6a8c7..2bde83f 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -300,8 +300,7 @@ wrong, use this command again to toggle back to the right 
mode."
         (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 (equal last-input-event ?\C-g)
+    (if (equal last-input-event (nth 3 (current-input-mode)))
        (keyboard-quit))
     (when (memq cmd '(universal-argument digit-argument))
       (call-interactively cmd)
@@ -314,16 +313,16 @@ wrong, use this command again to toggle back to the right 
mode."
        (let ((current-prefix-arg prefix-arg)
              ;; Have to bind `last-command-event' here so that
              ;; `digit-argument', for instance, can compute the
-             ;; prefix arg.
+             ;; `prefix-arg'.
              (last-command-event (aref keyseq 0)))
          (call-interactively cmd)))
 
       ;; This is the final call to `universal-argument-other-key', which
-      ;; set's the final `prefix-arg.
+      ;; sets the final `prefix-arg'.
       (let ((current-prefix-arg prefix-arg))
        (call-interactively cmd))
 
-      ;; Read the command to execute with the given prefix arg.
+      ;; Read the command to execute with the given `prefix-arg'.
       (setq prefix prefix-arg
            keyseq (read-key-sequence nil t)
            cmd (key-binding keyseq)))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]