* lisp/gnus/mm-util.el (mm-string-to-multibyte): Simplify.

2 files changed, 12 insertions, 19 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 741ddc3d960..cd87019dd14 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,5 +1,7 @@
 2010-11-01  Glenn Morris  <rgm@gnu.org>
 
+        * mm-util.el (mm-string-to-multibyte): Simplify.
+
         * shr.el (declare-function): Add compat stub.
         (url-cache-create-filename): Declare.
         (mm-disable-multibyte, widget-convert-button): Autoload.
@@ -662,12 +664,12 @@
 
         * nnimap.el (gnutls-negotiate): Silence the byte compiler.
 
-        * gnus-art.el, gnus-cache.el, gnus-fun.el, gnus-group.el,
-        gnus-picon.el, gnus-spec.el, gnus-sum.el, gnus-util.el, gnus.el,
-        mail-source.el, message.el, mm-bodies.el, mm-decode.el, mm-extern.el,
-        mm-util.el, mm-view.el, mml-smime.el, mml.el, mml1991.el, mml2015.el,
-        nnfolder.el, nnheader.el, nnmail.el, nnmaildir.el, nnrss.el, nntp.el,
-        rfc1843.el, sieve-manage.el, smime.el, spam.el:
+        * gnus-art.el, gnus-cache.el, gnus-fun.el, gnus-group.el:
+        * gnus-picon.el, gnus-spec.el, gnus-sum.el, gnus-util.el, gnus.el:
+        * mail-source.el, message.el, mm-bodies.el, mm-decode.el, mm-extern.el:
+        * mm-util.el, mm-view.el, mml-smime.el, mml.el, mml1991.el, mml2015.el:
+        * nnfolder.el, nnheader.el, nnmail.el, nnmaildir.el, nnrss.el, nntp.el:
+        * rfc1843.el, sieve-manage.el, smime.el, spam.el:
         Fix comment for declare-function.
 
 2010-10-11  Lars Magne Ingebrigtsen  <larsi@gnus.org>
diff --git a/lisp/gnus/mm-util.el b/lisp/gnus/mm-util.el
index b16e1d9556b..b06615cb61f 100644
--- a/lisp/gnus/mm-util.el
+++ b/lisp/gnus/mm-util.el
@@ -202,19 +202,10 @@ to the contents of the accessible portion of the buffer."
     (defalias 'mm-decode-coding-region 'decode-coding-region)
     (defalias 'mm-encode-coding-region 'encode-coding-region)))
 
-;; `string-to-multibyte' is available only in Emacs 22.1 or greater.
-(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 "")))))
+;; `string-to-multibyte' is available only in Emacs.
+(defalias 'mm-string-to-multibyte (if (featurep 'xemacs)
+                                      'identity
+                                    'string-to-multibyte))
 
 ;; `char-or-char-int-p' is an XEmacs function, not available in Emacs.
 (eval-and-compile