aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2008-10-22 06:44:52 +0000
committerGlenn Morris2008-10-22 06:44:52 +0000
commit735c5b1760012aec1fecec3cfc005f7eea7c9022 (patch)
treee34722d2b4dd804b40a7159132ba1386337da548
parente36819522379fd482e1a0aaf7077988cbc999fec (diff)
downloademacs-735c5b1760012aec1fecec3cfc005f7eea7c9022.tar.gz
emacs-735c5b1760012aec1fecec3cfc005f7eea7c9022.zip
(universal-coding-system-argument): Check for C-g. (Bug#1205)
-rw-r--r--lisp/international/mule-cmds.el5
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."
286 (format "Command to execute with %s:" coding-system))) 286 (format "Command to execute with %s:" coding-system)))
287 (cmd (key-binding keyseq)) 287 (cmd (key-binding keyseq))
288 prefix) 288 prefix)
289 289 ;; read-key-sequence ignores quit, so make an explicit check.
290 ;; Like many places, this assumes quit == C-g, but it need not be.
291 (if (char-equal last-input-char ?\C-g)
292 (keyboard-quit))
290 (when (memq cmd '(universal-argument digit-argument)) 293 (when (memq cmd '(universal-argument digit-argument))
291 (call-interactively cmd) 294 (call-interactively cmd)
292 295