Mercurial > emacs
changeset 61537:18b52f2ea5dc
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-256
Merge from gnus--rel--5.10
Patches applied:
* gnus--rel--5.10 (patch 65)
- Update from CVS
2005-04-13 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/gnus-art.el (gnus-mime-inline-part): Use mm-string-to-multibyte.
* lisp/gnus/qp.el (quoted-printable-encode-region): Use mm-string-to-multibyte.
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Wed, 13 Apr 2005 21:38:06 +0000 |
| parents | 12fc771528fa |
| children | 1ba2007fb029 |
| files | lisp/gnus/ChangeLog lisp/gnus/gnus-art.el lisp/gnus/qp.el |
| diffstat | 3 files changed, 18 insertions(+), 26 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/gnus/ChangeLog Wed Apr 13 20:41:10 2005 +0000 +++ b/lisp/gnus/ChangeLog Wed Apr 13 21:38:06 2005 +0000 @@ -1,3 +1,8 @@ +2005-04-13 Katsumi Yamaoka <yamaoka@jpl.org> + + * gnus-art.el (gnus-mime-inline-part): Use mm-string-to-multibyte. + * qp.el (quoted-printable-encode-region): Use mm-string-to-multibyte. + 2005-04-13 Miles Bader <miles@gnu.org> * mm-util.el (mm-string-to-multibyte): Use Gnus trunk definition. @@ -545,9 +550,6 @@ 2004-11-26 Katsumi Yamaoka <yamaoka@jpl.org> - * lpath.el: Remove bbdb-create-internal, bbdb-records, - spam-BBDB-register-routine and spam-enter-ham-BBDB. - * nnrss.el (nnrss-string-as-multibyte): Redefine it as a macro in order to silence the byte compiler.
--- a/lisp/gnus/gnus-art.el Wed Apr 13 20:41:10 2005 +0000 +++ b/lisp/gnus/gnus-art.el Wed Apr 13 21:38:06 2005 +0000 @@ -4358,21 +4358,16 @@ (mm-read-coding-system "Charset: ")))) (t (if (mm-handle-undisplayer handle) - (mm-remove-part handle)) - (setq contents - (if (fboundp 'string-to-multibyte) - (string-to-multibyte contents) - (mapconcat - (lambda (ch) (mm-string-as-multibyte (char-to-string ch))) - contents ""))))) + (mm-remove-part handle)))) (forward-line 2) - (mm-insert-inline handle - (if (and charset - (setq charset (mm-charset-to-coding-system - charset)) - (not (eq charset 'ascii))) - (mm-decode-coding-string contents charset) - contents)) + (mm-insert-inline + handle + (if (and charset + (setq charset (mm-charset-to-coding-system + charset)) + (not (eq charset 'ascii))) + (mm-decode-coding-string contents charset) + (mm-string-to-multibyte contents))) (goto-char b))))) (defun gnus-mime-view-part-as-charset (&optional handle arg)
--- a/lisp/gnus/qp.el Wed Apr 13 20:41:10 2005 +0000 +++ b/lisp/gnus/qp.el Wed Apr 13 21:38:06 2005 +0000 @@ -100,15 +100,10 @@ If `mm-use-ultra-safe-encoding' is set, fold lines unconditionally and encode lines starting with \"From\"." (interactive "r") - (save-excursion - (goto-char from) - (if (fboundp 'string-to-multibyte) ; Emacs 22 - (if (re-search-forward (string-to-multibyte "[^\x0-\x7f\x80-\xff]") - to t) - ;; Fixme: This is somewhat misleading. - (error "Multibyte character in QP encoding region")) - (if (re-search-forward (mm-string-as-multibyte "[^\0-\377]") to t) - (error "Multibyte character in QP encoding region")))) + (goto-char from) + (if (re-search-forward (mm-string-to-multibyte "[^\x0-\x7f\x80-\xff]") + to t) + (error "Multibyte character in QP encoding region")) (unless class ;; Avoid using 8bit characters. = is \075. ;; Equivalent to "^\000-\007\013\015-\037\200-\377="