procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge from gnus--rel--5.10

Browse source 
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
This commit is contained in:
Miles Bader 2006-11-27 00:37:36 +00:00
parent e2eef56d56
commit e8f0f70dc9
2 changed files with 17 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lisp/gnus/ChangeLog
View file

@ -14,6 +14,10 @@
(gnus-valid-select-methods, total-expire, gnus-summary-line-format) (gnus-valid-select-methods, total-expire, gnus-summary-line-format)
(gnus-group-read-only-p): Fix space/tab mixup in docstrings. (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> 2006-11-18 Andreas Seltenreich <uwi7@rz.uni-karlsruhe.de>
* mm-uu.el (mm-uu-pgp-signed-extract-1): Make last fix more thorough * mm-uu.el (mm-uu-pgp-signed-extract-1): Make last fix more thorough

19
lisp/gnus/mm-util.el
View file

@ -92,12 +92,6 @@
;; (string-to-multibyte s) ~= (decode-coding-string s 'binary) ;; (string-to-multibyte s) ~= (decode-coding-string s 'binary)
;; (string-make-multibyte s) ~= (decode-coding-string s locale-coding-system) ;; (string-make-multibyte s) ~= (decode-coding-string s locale-coding-system)
(string-as-multibyte . identity) (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) (multibyte-string-p . ignore)
(insert-byte . insert-char) (insert-byte . insert-char)
(multibyte-char-to-unibyte . identity)))) (multibyte-char-to-unibyte . identity))))
@ -128,6 +122,19 @@ This is a compatibility function for different Emacsen."
(setq start (- (length string) tail)))) (setq start (- (length string) tail))))
string)))) 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 (eval-and-compile
(defalias 'mm-char-or-char-int-p (defalias 'mm-char-or-char-int-p
(cond (cond