]> git.eshelyaron.com Git - emacs.git/commitdiff
(quail-start-translation, quail-start-conversion): Bind last-command-event,
authorEli Zaretskii <eliz@gnu.org>
Sun, 20 Jan 2002 17:52:22 +0000 (17:52 +0000)
committerEli Zaretskii <eliz@gnu.org>
Sun, 20 Jan 2002 17:52:22 +0000 (17:52 +0000)
last-command, and this-command in the first let.  This fixes the change from
2000-08-30.

lisp/international/quail.el

index 7872d22e83922272e57bae4a3daa4aa6d9082694..38d5a3c80036c4edc6cb2b9f4fb21049d4b828c2 100644 (file)
@@ -1340,7 +1340,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)
@@ -1357,9 +1358,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)
@@ -1394,7 +1396,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
@@ -1420,9 +1423,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)