diff options
| author | Miles Bader <miles@gnu.org> | 2006-11-27 00:37:36 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2006-11-27 00:37:36 +0000 |
| commit | e8f0f70dc99e40ec0de937368f21572da975926c (patch) | |
| tree | e998d13aefb04ab0ab5074ff048b13e4441382b6 /lisp/gnus | |
| parent | e2eef56d5622385c5ef42e0fbb1367887d9a3b89 (diff) | |
| download | emacs-e8f0f70dc99e40ec0de937368f21572da975926c.tar.gz | |
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
Diffstat (limited to 'lisp/gnus')
| -rw-r--r-- | lisp/gnus/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/gnus/mm-util.el | 19 |
2 files changed, 17 insertions, 6 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 2d3b4868b7e..68c82da1c6b 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -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 diff --git a/lisp/gnus/mm-util.el b/lisp/gnus/mm-util.el index 05c37a54e74..10cd78f71d9 100644 --- a/lisp/gnus/mm-util.el +++ b/lisp/gnus/mm-util.el @@ -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 @@ This is a compatibility function for different Emacsen." (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 |