Mercurial > emacs
changeset 74214:7cf0e45e7c70
Merge from gnus--rel--5.10
Patches applied:
* gnus--rel--5.10 (patch 168)
- Update from CVS
2006-11-21 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/mm-util.el (mm-string-to-multibyte): Alias to identity in XEmacs.
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-527
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Mon, 27 Nov 2006 00:37:36 +0000 |
| parents | 085dfebf66c5 |
| children | e80343741269 |
| files | lisp/gnus/ChangeLog lisp/gnus/mm-util.el |
| diffstat | 2 files changed, 17 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/gnus/ChangeLog Sun Nov 26 23:09:23 2006 +0000 +++ b/lisp/gnus/ChangeLog Mon Nov 27 00:37:36 2006 +0000 @@ -14,6 +14,10 @@ (gnus-valid-select-methods, total-expire, gnus-summary-line-format) (gnus-group-read-only-p): Fix space/tab mixup in docstrings. +2006-11-21 Katsumi Yamaoka <yamaoka@jpl.org> + + * mm-util.el (mm-string-to-multibyte): Alias to identity in XEmacs. + 2006-11-18 Andreas Seltenreich <uwi7@rz.uni-karlsruhe.de> * mm-uu.el (mm-uu-pgp-signed-extract-1): Make last fix more thorough
--- 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