diff lisp/gnus/mm-util.el @ 74214:7cf0e45e7c70

Merge from gnus--rel--5.10 Patches applied: * gnus--rel--5.10 (patch 168) - Update from CVS 2006-11-21 Katsumi Yamaoka <[e-mail]> * lisp/gnus/mm-util.el (mm-string-to-multibyte): Alias to identity in XEmacs. Revision: [e-mail]/emacs--devo--0--patch-527

--- a/lisp/gnus/mm-util.el	Sun Nov 26 23:09:23 2006 +0000
+++ b/lisp/gnus/mm-util.el	Mon Nov 27 00:37:36 2006 +0000
@@ -92,12 +92,6 @@
      ;; (string-to-multibyte s)   ~= (decode-coding-string s 'binary)
      ;; (string-make-multibyte s) ~= (decode-coding-string s locale-coding-system)
      (string-as-multibyte . identity)
-     (string-to-multibyte
-      . (lambda (string)
-	  "Return a multibyte string with the same individual chars as string."
-	  (mapconcat
-	   (lambda (ch) (mm-string-as-multibyte (char-to-string ch)))
-	   string "")))
      (multibyte-string-p . ignore)
      (insert-byte . insert-char)
      (multibyte-char-to-unibyte . identity))))
@@ -128,6 +122,19 @@
 	  (setq start (- (length string) tail))))
       string))))
 
+(defalias 'mm-string-to-multibyte
+  (cond
+   ((featurep 'xemacs)
+    'identity)
+   ((fboundp 'string-to-multibyte)
+    'string-to-multibyte)
+   (t
+    (lambda (string)
+      "Return a multibyte string with the same individual chars as string."
+      (mapconcat
+       (lambda (ch) (mm-string-as-multibyte (char-to-string ch)))
+       string "")))))
+
 (eval-and-compile
   (defalias 'mm-char-or-char-int-p
     (cond