[Emacs-diffs] /srv/bzr/emacs/trunk r102189: * lisp/gnus/mm-util.el (mm-string-to-multibyte): Simplify.

[Glenn Morris]

------------------------------------------------------------
revno: 102189
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sun 2010-10-31 19:21:42 -0700
message:
  * lisp/gnus/mm-util.el (mm-string-to-multibyte): Simplify.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/mm-util.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2010-11-01 02:19:17 +0000
+++ b/lisp/gnus/ChangeLog       2010-11-01 02:21:42 +0000
@@ -1,5 +1,7 @@
 2010-11-01  Glenn Morris  <address@hidden>
 
+       * 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  <address@hidden>

=== modified file 'lisp/gnus/mm-util.el'
--- a/lisp/gnus/mm-util.el      2010-10-11 23:29:33 +0000
+++ b/lisp/gnus/mm-util.el      2010-11-01 02:21:42 +0000
@@ -202,19 +202,10 @@
     (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