mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

Move “Fix some broken conditional forms” to master

Browse source 
Revert 2020-01-04T19:17:12Z!eggert@cs.ucla.edu
which recently I installed into the emacs-27 branch by mistake.
These patches are now on master instead (via merging).
Do not merge to master.
This commit is contained in:
Paul Eggert 2020-01-05 11:48:59 -08:00
parent 448df8fec7
commit 088bfcc2d8
12 changed files with 47 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lisp/gnus/gnus-cloud.el
View file

@ -243,10 +243,10 @@ Use old data if FORCE-OLDER is not nil."
(when (or (not gnus-cloud-interactive)
(gnus-y-or-n-p
(format "%s has older different info in the cloud as of %s, update it here? "
group date)))
(gnus-message 2 "Installing cloud update of group %s" group)
(gnus-set-info group contents)
(gnus-group-update-group group))))
group date))))
(gnus-message 2 "Installing cloud update of group %s" group)
(gnus-set-info group contents)
(gnus-group-update-group group)))
(gnus-error 1 "Sorry, group %s is not subscribed" group))
(gnus-error 1 "Sorry, could not update newsrc for group %s (invalid data %S)"
group elem))))

11
lisp/gnus/mml-smime.el
View file

@ -154,9 +154,14 @@ Whether the passphrase is cached at all is controlled by
(write-region (point-min) (point-max) file))
(push file certfiles)
(push file tmpfiles)))
(smime-encrypt-buffer certfiles)
(while (setq tmp (pop tmpfiles))
(delete-file tmp)))
(if (smime-encrypt-buffer certfiles)
(progn
(while (setq tmp (pop tmpfiles))
(delete-file tmp))
t)
(while (setq tmp (pop tmpfiles))
(delete-file tmp))
nil))
(goto-char (point-max)))
(defvar gnus-extract-address-components)