(quail-start-translation, quail-start-conversion): Bind

last-command-event, last-command, and this-command in the first let.
This fixes the change from 2000-08-30.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3629c46c56908660c253d7b48957aed129086596..187497ed47143514df62a09839eddb06dcb49685 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2002-01-08  Eli Zaretskii  <eliz@is.elta.co.il>
+
+       * international/quail.el (quail-start-translation)
+       (quail-start-conversion): Bind last-command-event, last-command,
+       and this-command in the first let.  This fixes the change from
+       2000-08-30.
+
 2002-01-08  Michael Kifer  <kifer@cs.stonybrook.edu>
        
        * ediff-hook.el: added an autoload cookie.

diff --git a/lisp/international/quail.el b/lisp/international/quail.el
index 1beb34565a02f0bab3e040dfc84d00124bedeb47..0c301111dac7f5add89e233acf8470824a45dd77 100644 (file)
--- a/lisp/international/quail.el
+++ b/lisp/international/quail.el
@@ -1363,7 +1363,8 @@ Return the input string."
             (overriding-terminal-local-map (quail-translation-keymap))
             (generated-events nil)
             (input-method-function nil)
-            (modified-p (buffer-modified-p)))
+            (modified-p (buffer-modified-p))
+            last-command-event last-command this-command)
        (setq quail-current-key ""
              quail-current-str ""
              quail-translating t)
@@ -1380,9 +1381,10 @@ Return the input string."
            (if (if key
                    (and (commandp cmd) (not (eq cmd 'quail-other-command)))
                  (eq cmd 'quail-self-insert-command))
-               (let ((last-command-event (aref keyseq (1- (length keyseq))))
-                     (last-command this-command)
-                     (this-command cmd))
+               (progn
+                 (setq last-command-event (aref keyseq (1- (length keyseq)))
+                       last-command this-command
+                       this-command cmd)
                  (setq key t)
                  (condition-case err
                      (call-interactively cmd)
@@ -1417,7 +1419,8 @@ Return the input string."
             (overriding-terminal-local-map (quail-conversion-keymap))
             (generated-events nil)
             (input-method-function nil)
-            (modified-p (buffer-modified-p)))
+            (modified-p (buffer-modified-p))
+            last-command-event last-command this-command)
        (setq quail-current-key ""
              quail-current-str ""
              quail-translating t
@@ -1443,9 +1446,10 @@ Return the input string."
                          nil nil t))
                 (cmd (lookup-key (quail-conversion-keymap) keyseq)))
            (if (if key (commandp cmd) (eq cmd 'quail-self-insert-command))
-               (let ((last-command-event (aref keyseq (1- (length keyseq))))
-                     (last-command this-command)
-                     (this-command cmd))
+               (progn
+                 (setq last-command-event (aref keyseq (1- (length keyseq)))
+                       last-command this-command
+                       this-command cmd)
                  (setq key t)
                  (condition-case err
                      (call-interactively cmd)