From: Kenichi Handa <handa@m17n.org>
Date: Wed, 30 Aug 2000 00:44:29 +0000 (+0000)
Subject: (quail-start-translation): Bind locally
X-Git-Tag: emacs-pretest-21.0.90~1879
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=185479c6a55821e8e075446a85acec46b4583615;p=emacs.git

(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 ea6254d31ae..227126eeacd 100644
--- 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)))