From: Chong Yidong <cyd@stupidchicken.com>
Date: Thu, 21 Jan 2010 14:03:10 +0000 (-0500)
Subject: Fix sgml-maybe-name-self (Bug#5380).
X-Git-Tag: emacs-pretest-23.1.92~30^2~3^2~25
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f0bd0ad525b8867540351715dda5743f8b4c4bd1;p=emacs.git

Fix sgml-maybe-name-self (Bug#5380).

* textmodes/sgml-mode.el (sgml-maybe-name-self): No need to
process last-command-event, as it is now decoded first (Bug#5380).
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3d99f723a31..c3c95a95aa7 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-21  Kenichi Handa  <handa@m17n.org>
+
+	* textmodes/sgml-mode.el (sgml-maybe-name-self): No need to
+	process last-command-event, as it is now decoded first (Bug#5380).
+
 2010-01-20  Chong Yidong  <cyd@stupidchicken.com>
 
 	* term.el (term-send-raw-meta): Revert 2009-12-04 change (Bug#5330).
diff --git a/lisp/textmodes/sgml-mode.el b/lisp/textmodes/sgml-mode.el
index 996734637bc..b9d52acdeba 100644
--- a/lisp/textmodes/sgml-mode.el
+++ b/lisp/textmodes/sgml-mode.el
@@ -608,11 +608,7 @@ Uses `sgml-char-names'."
   "Insert a symbolic character name according to `sgml-char-names'."
   (interactive "*")
   (if sgml-name-8bit-mode
-      (let ((mc last-command-event))
-	(if (< mc 256)
-	    (setq mc (unibyte-char-to-multibyte mc)))
-	(or mc (setq mc last-command-event))
-	(sgml-name-char mc))
+      (sgml-name-char last-command-event)
     (self-insert-command 1)))
 
 (defun sgml-name-8bit-mode ()