[Emacs-diffs] /srv/bzr/emacs/trunk r102618: mm-util.el (mm-ucs-to-char): Use eval-and-compile.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 102618
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Thu 2010-12-09 11:11:11 +0000
message:
  mm-util.el (mm-ucs-to-char): Use eval-and-compile.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/mm-util.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2010-12-09 10:43:50 +0000
+++ b/lisp/gnus/ChangeLog       2010-12-09 11:11:11 +0000
@@ -4,6 +4,8 @@
 
 2010-12-09  Katsumi Yamaoka  <address@hidden>
 
+       * mm-util.el (mm-ucs-to-char): Use eval-and-compile.
+
        * shr.el (shr-image-displayer): Work for images lined side by side.
 
 2010-12-08  Robert Pluim  <address@hidden>

=== modified file 'lisp/gnus/mm-util.el'
--- a/lisp/gnus/mm-util.el      2010-12-07 05:06:56 +0000
+++ b/lisp/gnus/mm-util.el      2010-12-09 11:11:11 +0000
@@ -220,42 +220,43 @@
      (t 'identity))))
 
 ;; `ucs-to-char' is a function that Mule-UCS provides.
-(if (featurep 'xemacs)
-    (cond ((and (fboundp 'unicode-to-char) ;; XEmacs 21.5.
-               (subrp (symbol-function 'unicode-to-char)))
-          (if (featurep 'mule)
-              (defalias 'mm-ucs-to-char 'unicode-to-char)
-            (defun mm-ucs-to-char (codepoint)
-              "Convert Unicode codepoint to character."
-              (or (unicode-to-char codepoint) ?#))))
-         ((featurep 'mule)
-          (defun mm-ucs-to-char (codepoint)
-            "Convert Unicode codepoint to character."
-            (if (fboundp 'ucs-to-char) ;; Mule-UCS is loaded.
-                (progn
-                  (defalias 'mm-ucs-to-char
-                    (lambda (codepoint)
-                      "Convert Unicode codepoint to character."
-                      (condition-case nil
-                          (or (ucs-to-char codepoint) ?#)
-                        (error ?#))))
-                  (mm-ucs-to-char codepoint))
+(eval-and-compile
+  (if (featurep 'xemacs)
+      (cond ((and (fboundp 'unicode-to-char) ;; XEmacs 21.5.
+                 (subrp (symbol-function 'unicode-to-char)))
+            (if (featurep 'mule)
+                (defalias 'mm-ucs-to-char 'unicode-to-char)
+              (defun mm-ucs-to-char (codepoint)
+                "Convert Unicode codepoint to character."
+                (or (unicode-to-char codepoint) ?#))))
+           ((featurep 'mule)
+            (defun mm-ucs-to-char (codepoint)
+              "Convert Unicode codepoint to character."
+              (if (fboundp 'ucs-to-char) ;; Mule-UCS is loaded.
+                  (progn
+                    (defalias 'mm-ucs-to-char
+                      (lambda (codepoint)
+                        "Convert Unicode codepoint to character."
+                        (condition-case nil
+                            (or (ucs-to-char codepoint) ?#)
+                          (error ?#))))
+                    (mm-ucs-to-char codepoint))
+                (condition-case nil
+                    (or (int-to-char codepoint) ?#)
+                  (error ?#)))))
+           (t
+            (defun mm-ucs-to-char (codepoint)
+              "Convert Unicode codepoint to character."
               (condition-case nil
                   (or (int-to-char codepoint) ?#)
                 (error ?#)))))
-         (t
-          (defun mm-ucs-to-char (codepoint)
-            "Convert Unicode codepoint to character."
-            (condition-case nil
-                (or (int-to-char codepoint) ?#)
-              (error ?#)))))
-  (if (let ((char (make-char 'japanese-jisx0208 36 34)))
-       (eq char (decode-char 'ucs char)))
-      ;; Emacs 23.
-      (defalias 'mm-ucs-to-char 'identity)
-    (defun mm-ucs-to-char (codepoint)
-      "Convert Unicode codepoint to character."
-      (or (decode-char 'ucs codepoint) ?#))))
+    (if (let ((char (make-char 'japanese-jisx0208 36 34)))
+         (eq char (decode-char 'ucs char)))
+       ;; Emacs 23.
+       (defalias 'mm-ucs-to-char 'identity)
+      (defun mm-ucs-to-char (codepoint)
+       "Convert Unicode codepoint to character."
+       (or (decode-char 'ucs codepoint) ?#)))))
 
 ;; Fixme:  This seems always to be used to read a MIME charset, so it
 ;; should be re-named and fixed (in Emacs) to offer completion only on