mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-05 07:01:11 -08:00
Code Issues Projects Releases Wiki Activity

Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-139

Browse source 
Merge from gnus--rel--5.10

Patches applied:

 * miles@gnu.org--gnu-2005/gnus--rel--5.10  (patch 32-33)

   - Merge from emacs--cvs-trunk--0
   - Update from CVS

2005-02-27  Arne J,Ax(Brgensen  <arne@arnested.dk>

   * lisp/gnus/mm-decode.el (mm-dissect-buffer): Pass the from field on to
   `mm-dissect-multipart' and receive the from field as an (optional)
   argument from `mm-dissect-multipart'.
   (mm-dissect-multipart): Receive the from field as an argument and
   pass it on when we call `mm-dissect-buffer' on MIME parts. Fixes
   verification/decryption of signed/encrypted MIME parts.
This commit is contained in:
Miles Bader 2005-02-28 00:04:11 +00:00
parent fc88c2888f
commit ee7d3cc090
2 changed files with 17 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
lisp/gnus/ChangeLog
View file

@ -1,3 +1,12 @@
2005-02-27 Arne J,Ax(Brgensen <arne@arnested.dk>
* mm-decode.el (mm-dissect-buffer): Pass the from field on to
`mm-dissect-multipart' and receive the from field as an (optional)
argument from `mm-dissect-multipart'.
(mm-dissect-multipart): Receive the from field as an argument and
pass it on when we call `mm-dissect-buffer' on MIME parts. Fixes
verification/decryption of signed/encrypted MIME parts.
2005-02-26 Stefan Monnier <monnier@iro.umontreal.ca>
* gnus-sum.el (gnus-summary-exit): Move point after displaying the

15
lisp/gnus/mm-decode.el
View file

@ -509,10 +509,10 @@ Postpone undisplaying of viewers for types in
(message "Destroying external MIME viewers")
(mm-destroy-parts mm-postponed-undisplay-list)))
(defun mm-dissect-buffer (&optional no-strict-mime loose-mime)
(defun mm-dissect-buffer (&optional no-strict-mime loose-mime from)
"Dissect the current buffer and return a list of MIME handles."
(save-excursion
(let (ct ctl type subtype cte cd description id result from)
(let (ct ctl type subtype cte cd description id result)
(save-restriction
(mail-narrow-to-head)
(when (or no-strict-mime
@ -523,8 +523,9 @@ Postpone undisplaying of viewers for types in
cte (mail-fetch-field "content-transfer-encoding")
cd (mail-fetch-field "content-disposition")
description (mail-fetch-field "content-description")
from (mail-fetch-field "from")
id (mail-fetch-field "content-id"))
(unless from
(setq from (mail-fetch-field "from")))
;; FIXME: In some circumstances, this code is running within
;; an unibyte macro. mail-extract-address-components
;; creates unibyte buffers. This `if', though not a perfect
@ -567,7 +568,7 @@ Postpone undisplaying of viewers for types in
'from from
'start start)
(car ctl))
(cons (car ctl) (mm-dissect-multipart ctl))))
(cons (car ctl) (mm-dissect-multipart ctl from))))
(t
(mm-possibly-verify-or-decrypt
(mm-dissect-singlepart
@ -594,7 +595,7 @@ Postpone undisplaying of viewers for types in
(mm-make-handle
(mm-copy-to-buffer) ctl cte nil cdl description nil id)))
(defun mm-dissect-multipart (ctl)
(defun mm-dissect-multipart (ctl from)
(goto-char (point-min))
(let* ((boundary (concat "\n--" (mail-content-type-get ctl 'boundary)))
(close-delimiter (concat (regexp-quote boundary) "--[ \t]*$"))
@ -611,7 +612,7 @@ Postpone undisplaying of viewers for types in
(save-excursion
(save-restriction
(narrow-to-region start (point))
(setq parts (nconc (list (mm-dissect-buffer t)) parts)))))
(setq parts (nconc (list (mm-dissect-buffer t nil from)) parts)))))
(end-of-line 2)
(or (looking-at boundary)
(forward-line 1))
@ -620,7 +621,7 @@ Postpone undisplaying of viewers for types in
(save-excursion
(save-restriction
(narrow-to-region start end)
(setq parts (nconc (list (mm-dissect-buffer t)) parts)))))
(setq parts (nconc (list (mm-dissect-buffer t nil from)) parts)))))
(mm-possibly-verify-or-decrypt (nreverse parts) ctl)))
(defun mm-copy-to-buffer ()