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

Handle successive mime sections in decoding.

Browse source 
rmailsum.el (rmail-epa-decode):Handle blank lines at start.
Handle both ending delim and another starting delim.
This commit is contained in:
Matt Armstrong 2022-10-07 08:17:50 -04:00 • committed by Richard Stallman
parent def6fa4246
commit 67a20bb4b5
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lisp/mail/rmail.el
View file

@ -4693,15 +4693,23 @@ Argument MIME is non-nil if this is a mime message."
(save-excursion
(goto-char (point-min))
(while (re-search-forward "--------------[0-9a-zA-Z]+\n" nil t)
(let ((delim (concat (substring (match-string 0) 0 -1) "--\n")))
;; The ending delimiter is a start delimiter if another section follows.
;; Otherwise it is an end delimiter, with -- affixed.
(let ((delim (concat (substring (match-string 0) 0 -1) "\\(\\|--\\)\n")))
(when (looking-at "\
Content-Type: text/[a-z]+; charset=UTF-8; format=flowed
Content-Transfer-Encoding: base64\n")
(goto-char (match-end 0))
;; Sometimes the attachment's headers are followed by blank lines
(while (eolp)
(forward-line 1))
(let ((start (point))
(inhibit-read-only t))
(search-forward delim)
(re-search-forward delim)
(forward-line -1)
;; Sometimes the attachment's contents are followed by blank lines
(while (save-excursion (forward-line -1) (eolp))
(forward-line -1))
(base64-decode-region start (point))
(forward-line 1)))))))