mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-02-04 20:27:45 +00:00
Code Issues Releases Activity

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-257

Browse Source 
Merge from gnus--rel--5.10

Patches applied:

 * gnus--rel--5.10  (patch 98)

   - Update from CVS
This commit is contained in:
Miles Bader 2006-05-02 05:25:20 +00:00
parent 90b5715673
commit 9606f1cb5c
3 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lisp/gnus/ChangeLog
View File

@ -1,3 +1,11 @@
2006-04-28 Katsumi Yamaoka <yamaoka@jpl.org>
* mm-uu.el (mm-uu-pgp-encrypted-extract-1): Assume buffer is made
unibyte after clear-decrypt function runs.
* mml2015.el (mml2015-pgg-clear-decrypt): Treat data which pgg
returns as a unibyte string.
2006-04-27 Katsumi Yamaoka <yamaoka@jpl.org>
* lpath.el: Don't fbind string-as-multibyte for XEmacs.

17
lisp/gnus/mm-uu.el
View File

@ -436,11 +436,18 @@ Return that buffer."
"OK")))
(progn
;; Decode charset.
(when (and (or charset
(setq charset gnus-newsgroup-charset))
(setq charset (mm-charset-to-coding-system charset))
(not (eq charset 'ascii)))
(mm-decode-coding-region (point-min) (point-max) charset))
(if (and (or charset
(setq charset gnus-newsgroup-charset))
(setq charset (mm-charset-to-coding-system charset))
(not (eq charset 'ascii)))
;; Assume that buffer's multibyteness is turned off.
;; See `mml2015-pgg-clear-decrypt'.
(insert (mm-decode-coding-string (prog1
(buffer-string)
(erase-buffer)
(mm-enable-multibyte))
charset))
(mm-enable-multibyte))
(list (mm-make-handle buf mm-uu-text-plain-type)))
(list (mm-make-handle buf '("application/pgp-encrypted")))))))

2
lisp/gnus/mml2015.el
View File

@ -707,6 +707,8 @@
(buffer-string))))
(progn
(erase-buffer)
;; Treat data which pgg returns as a unibyte string.
(mm-disable-multibyte)
(insert-buffer-substring pgg-output-buffer)
(goto-char (point-min))
(while (search-forward "\r\n" nil t)