Mercurial > emacs
changeset 108482:21f80ea9c6a6
Synch with Gnus trunk.
(mm-extern-url): Don't use mm-with-unibyte-current-buffer.
(mm-extern-cache-contents): Use with-current-buffer instead of
save-excursion + set-buffer.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Tue, 11 May 2010 04:44:44 +0000 |
| parents | cea42c2d7982 (current diff) d72eb924677c (diff) |
| children | f5e0c0365ac0 0eeae12a33a9 |
| files | |
| diffstat | 2 files changed, 10 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/gnus/ChangeLog Mon May 10 20:18:58 2010 -0700 +++ b/lisp/gnus/ChangeLog Tue May 11 04:44:44 2010 +0000 @@ -1,3 +1,10 @@ +2010-05-11 Katsumi Yamaoka <yamaoka@jpl.org> + + * mm-extern.el (mm-extern-url): Don't use + mm-with-unibyte-current-buffer. + (mm-extern-cache-contents): Use with-current-buffer instead of + save-excursion + set-buffer. + 2010-05-10 Katsumi Yamaoka <yamaoka@jpl.org> * mm-util.el (mm-emacs-mule): Remove.
--- a/lisp/gnus/mm-extern.el Mon May 10 20:18:58 2010 -0700 +++ b/lisp/gnus/mm-extern.el Tue May 11 04:44:44 2010 +0000 @@ -67,9 +67,8 @@ (coding-system-for-read mm-binary-coding-system)) (unless url (error "URL is not specified")) - (mm-with-unibyte-current-buffer - (mm-url-insert-file-contents url)) (mm-disable-multibyte) + (mm-url-insert-file-contents url) (setq buffer-file-name name))) (defun mm-extern-anon-ftp (handle) @@ -125,7 +124,7 @@ (or access-type (error "Couldn't find access type")))) mm-extern-function-alist))) - buf handles) + handles) (unless func (error "Access type (%s) is not supported" access-type)) (mm-with-part handle @@ -136,8 +135,7 @@ (unless (bufferp (car handles)) (mm-destroy-parts handles) (error "Multipart external body is not supported")) - (save-excursion - (set-buffer (setq buf (mm-handle-buffer handles))) + (with-current-buffer (mm-handle-buffer handles) (let (good) (unwind-protect (progn