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 3d99f723a310e7f052e215c769b02a80b57bd0cb..c3c95a95aa7b1c66fea9f0f581f366ce262896e3 100644 (file)
--- 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 996734637bc5bd7d2fafa2cf0705a63f5cd09a78..b9d52acdebab46c92429ea9d98f20d196a6b6064 100644 (file)
--- 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 ()