(quail-start-translation): Bind locally

last-command-event, last-command, and this-command.
(quail-start-conversion): Likewise.

diff --git a/lisp/international/quail.el b/lisp/international/quail.el
index ea6254d31ae41c6f7470375e343cb98b91f20942..227126eeacdfd9ab005f06b0b64401e27a5fe828 100644 (file)
--- a/lisp/international/quail.el
+++ b/lisp/international/quail.el
@@ -1070,11 +1070,10 @@ The returned value is a Quail map specific to KEY."
            (if (if key
                    (and (commandp cmd) (not (eq cmd 'quail-other-command)))
                  (eq cmd 'quail-self-insert-command))
-               (progn
+               (let ((last-command-event (aref keyseq (1- (length keyseq))))
+                     (last-command this-command)
+                     (this-command cmd))
                  (setq key t)
-                 (setq last-command-event (aref keyseq (1- (length keyseq)))
-                       last-command this-command
-                       this-command cmd)
                  (condition-case err
                      (call-interactively cmd)
                    (quail-error (message "%s" (cdr err)) (beep))))
@@ -1162,11 +1161,10 @@ The returned value is a Quail map specific to KEY."
                          nil nil t))
                 (cmd (lookup-key (quail-conversion-keymap) keyseq)))
            (if (if key (commandp cmd) (eq cmd 'quail-self-insert-command))
-               (progn
+               (let ((last-command-event (aref keyseq (1- (length keyseq))))
+                     (last-command this-command)
+                     (this-command cmd))
                  (setq key t)
-                 (setq last-command-event (aref keyseq (1- (length keyseq)))
-                       last-command this-command
-                       this-command cmd)
                  (condition-case err
                      (call-interactively cmd)
                    (quail-error (message "%s" (cdr err)) (beep)))