Mercurial > emacs

changeset 42611:7bb381bfe22a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(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.
author Eli Zaretskii <eliz@gnu.org>
date Tue, 08 Jan 2002 17:42:59 +0000
parents b09ddb75fc36
children cc40a97b7718
files lisp/international/quail.el
diffstat 1 files changed, 12 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/international/quail.el	Tue Jan 08 17:29:56 2002 +0000
+++ b/lisp/international/quail.el	Tue Jan 08 17:42:59 2002 +0000
@@ -1363,7 +1363,8 @@
 	     (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 @@
 	    (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 @@
 	     (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 @@
 			  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)