Move “Fix some broken conditional forms” to master

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.

2 files changed, 12 insertions, 7 deletions

diff --git a/lisp/gnus/gnus-cloud.el b/lisp/gnus/gnus-cloud.el
index 4d8764bacca..cecfaef2f4f 100644
--- a/lisp/gnus/gnus-cloud.el
+++ b/lisp/gnus/gnus-cloud.el
@@ -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))))
diff --git a/lisp/gnus/mml-smime.el b/lisp/gnus/mml-smime.el
index 4754f37a2da..3cc463d5d4c 100644
--- a/lisp/gnus/mml-smime.el
+++ b/lisp/gnus/mml-smime.el
@@ -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)