emacs: Use 'and' instead of 'when' when the return value matters

[notmuch] / emacs / notmuch-draft.el

diff --git a/emacs/notmuch-draft.el b/emacs/notmuch-draft.el
index c3cb619fdf4454d33a24557a298ebf22ee3f48f6..759e6c9e47a00d539c31219c6f3f0e007920cd20 100644 (file)
--- a/emacs/notmuch-draft.el
+++ b/emacs/notmuch-draft.el
@@ -153,17 +153,17 @@ Used when a new version is saved, or the message is sent."
 
 `notmuch-draft-save-plaintext' controls the behaviour."
   (cl-case notmuch-draft-save-plaintext
 
 `notmuch-draft-save-plaintext' controls the behaviour."
   (cl-case notmuch-draft-save-plaintext

-       ((ask)
-        (unless (yes-or-no-p
-                 "(Customize `notmuch-draft-save-plaintext' to avoid this warning)
+    ((ask)
+     (unless (yes-or-no-p
+             "(Customize `notmuch-draft-save-plaintext' to avoid this warning)

 This message contains mml tags that suggest it is intended to be encrypted.
 Really save and index an unencrypted copy? ")
 This message contains mml tags that suggest it is intended to be encrypted.
 Really save and index an unencrypted copy? ")

-          (error "Save aborted")))
-       ((nil)
-        (error "Refusing to save draft with encryption tags (see `%s')"
-               'notmuch-draft-save-plaintext))
-       ((t)
-        (ignore))))
+       (error "Save aborted")))
+    ((nil)
+     (error "Refusing to save draft with encryption tags (see `%s')"
+           'notmuch-draft-save-plaintext))
+    ((t)
+     (ignore))))

 
 (defun notmuch-draft--make-message-id ()
   ;; message-make-message-id gives the id inside a "<" ">" pair,
 
 (defun notmuch-draft--make-message-id ()
   ;; message-make-message-id gives the id inside a "<" ">" pair,


@@ -263,7 +263,7 @@ applied to newly inserted messages)."
       ;; If the resumed message was a draft then set the draft
       ;; message-id so that we can delete the current saved draft if the
       ;; message is resaved or sent.
       ;; If the resumed message was a draft then set the draft
       ;; message-id so that we can delete the current saved draft if the
       ;; message is resaved or sent.

-      (setq notmuch-draft-id (when draft id)))))
+      (setq notmuch-draft-id (and draft id)))))

 
 
 (add-hook 'message-send-hook 'notmuch-draft--mark-deleted)
 
 
 (add-hook 'message-send-hook 'notmuch-draft--mark-deleted)