(make-char): Remove redundancy.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f66b3838c2a65f708619820d7adb2fdcfb2008ab..4598e38a2612ca3e8fd6051acff1b94282e8d465 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2006-07-07  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+       * international/mule.el (make-char): Remove redundancy.
+
        * emacs-lisp/bytecomp.el (byte-compile-form): The `byte-compile'
        property may contain an anonymous function rather than a symbol.
 

diff --git a/lisp/international/mule.el b/lisp/international/mule.el
index a248a44916662bcdfa7176c515979b75542f9d41..31e3b5cedb0f4fa5cb820f69bfc66c79851fb61c 100644 (file)
--- a/lisp/international/mule.el
+++ b/lisp/international/mule.el
@@ -1,6 +1,6 @@
 ;;; mule.el --- basic commands for mulitilingual environment
 
-;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
 ;;   Free Software Foundation, Inc.
 ;; Copyright (C) 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
@@ -283,16 +283,14 @@ would need to index the corresponding Emacs charset."
   (make-char-internal (charset-id charset) code1 code2))
 
 (put 'make-char 'byte-compile
-     (function
-      (lambda (form)
-       (let ((charset (nth 1 form)))
-         (if (charset-quoted-standard-p charset)
-             (byte-compile-normal-call
-              (cons 'make-char-internal
-                    (cons (charset-id (nth 1 charset)) (nthcdr 2 form))))
-           (byte-compile-normal-call
-            (cons 'make-char-internal
-                  (cons (list 'charset-id charset) (nthcdr 2 form)))))))))
+     (lambda (form)
+       (let ((charset (nth 1 form)))
+         (byte-compile-normal-call
+          (cons 'make-char-internal
+                (cons (if (charset-quoted-standard-p charset)
+                          (charset-id (nth 1 charset))
+                        (list 'charset-id charset))
+                      (nthcdr 2 form)))))))
 
 (defun charset-list ()
   "Return list of charsets ever defined.
@@ -2301,5 +2299,5 @@ This function is intended to be added to `auto-coding-functions'."
 ;;;
 (provide 'mule)
 
-;;; arch-tag: 9aebaa6e-0e8a-40a9-b857-cb5d04a39e7c
+;; arch-tag: 9aebaa6e-0e8a-40a9-b857-cb5d04a39e7c
 ;;; mule.el ends here