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

[notmuch] / emacs / notmuch-mua.el

diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el
index 1efc88ea4020ceaef8b667e0d68c81a472b478dd..f6d8ffc55ca9de4abec415fa088ffc46910843fb 100644 (file)
--- a/emacs/notmuch-mua.el
+++ b/emacs/notmuch-mua.el
@@ -58,7 +58,7 @@ window/frame that will be destroyed when the buffer is killed.
 You may want to customize `message-kill-buffer-on-exit'
 accordingly."
    (when (< emacs-major-version 24)
 You may want to customize `message-kill-buffer-on-exit'
 accordingly."
    (when (< emacs-major-version 24)

-          " Due to a known bug in Emacs 23, you should not set
+     " Due to a known bug in Emacs 23, you should not set

 this to `new-window' if `message-kill-buffer-on-exit' is
 disabled: this would result in an incorrect behavior."))
   :group 'notmuch-send
 this to `new-window' if `message-kill-buffer-on-exit' is
 disabled: this would result in an incorrect behavior."))
   :group 'notmuch-send


@@ -106,13 +106,13 @@ Note that these functions use `mail-citation-hook' if that is non-nil."
 This function specifies which parts of a mime message with
 multiple parts get a header."
   :type '(radio (const :tag "No part headers"
 This function specifies which parts of a mime message with
 multiple parts get a header."
   :type '(radio (const :tag "No part headers"

-                              notmuch-show-reply-insert-header-p-never)
+                      notmuch-show-reply-insert-header-p-never)

                (const :tag "All except multipart/* and hidden parts"
                (const :tag "All except multipart/* and hidden parts"

-                              notmuch-show-reply-insert-header-p-trimmed)
+                      notmuch-show-reply-insert-header-p-trimmed)

                (const :tag "Only for included text parts"
                (const :tag "Only for included text parts"

-                              notmuch-show-reply-insert-header-p-minimal)
+                      notmuch-show-reply-insert-header-p-minimal)

                (const :tag "Exactly as in show view"
                (const :tag "Exactly as in show view"

-                              notmuch-show-insert-header-p)
+                      notmuch-show-insert-header-p)

                (function :tag "Other"))
   :group 'notmuch-reply)
 
                (function :tag "Other"))
   :group 'notmuch-reply)
 


@@ -205,10 +205,12 @@ Typically this is added to `notmuch-mua-send-hook'."
 (defun notmuch-mua-reply-crypto (parts)
   "Add mml sign-encrypt flag if any part of original message is encrypted."
   (cl-loop for part in parts
 (defun notmuch-mua-reply-crypto (parts)
   "Add mml sign-encrypt flag if any part of original message is encrypted."
   (cl-loop for part in parts

-          if (notmuch-match-content-type (plist-get part :content-type) "multipart/encrypted")
-            do (mml-secure-message-sign-encrypt)
-          else if (notmuch-match-content-type (plist-get part :content-type) "multipart/*")
-            do (notmuch-mua-reply-crypto (plist-get part :content))))
+          if (notmuch-match-content-type (plist-get part :content-type)
+                                         "multipart/encrypted")
+          do (mml-secure-message-sign-encrypt)
+          else if (notmuch-match-content-type (plist-get part :content-type)
+                                              "multipart/*")
+          do (notmuch-mua-reply-crypto (plist-get part :content))))

 
 ;; There is a bug in emacs 23's message.el that results in a newline
 ;; not being inserted after the References header, so the next header
 
 ;; There is a bug in emacs 23's message.el that results in a newline
 ;; not being inserted after the References header, so the next header


@@ -226,22 +228,17 @@ Typically this is added to `notmuch-mua-send-hook'."
        original)
     (when process-crypto
       (setq args (append args '("--decrypt=true"))))
        original)
     (when process-crypto
       (setq args (append args '("--decrypt=true"))))

-

     (if reply-all
        (setq args (append args '("--reply-to=all")))
       (setq args (append args '("--reply-to=sender"))))
     (setq args (append args (list query-string)))
     (if reply-all
        (setq args (append args '("--reply-to=all")))
       (setq args (append args '("--reply-to=sender"))))
     (setq args (append args (list query-string)))

-

     ;; Get the reply object as SEXP, and parse it into an elisp object.
     (setq reply (apply #'notmuch-call-notmuch-sexp args))
     ;; Get the reply object as SEXP, and parse it into an elisp object.
     (setq reply (apply #'notmuch-call-notmuch-sexp args))

-

     ;; Extract the original message to simplify the following code.
     (setq original (plist-get reply :original))
     ;; Extract the original message to simplify the following code.
     (setq original (plist-get reply :original))

-

     ;; Extract the headers of both the reply and the original message.
     (let* ((original-headers (plist-get original :headers))
           (reply-headers (plist-get reply :reply-headers)))
     ;; Extract the headers of both the reply and the original message.
     (let* ((original-headers (plist-get original :headers))
           (reply-headers (plist-get reply :reply-headers)))

-

       ;; If sender is non-nil, set the From: header to its value.
       (when sender
        (plist-put reply-headers :From sender))
       ;; If sender is non-nil, set the From: header to its value.
       (when sender
        (plist-put reply-headers :From sender))


@@ -249,9 +246,9 @@ Typically this is added to `notmuch-mua-send-hook'."
          ;; Overlay the composition window on that being used to read
          ;; the original message.
          ((same-window-regexps '("\\*mail .*")))
          ;; Overlay the composition window on that being used to read
          ;; the original message.
          ((same-window-regexps '("\\*mail .*")))

-
-       ;; We modify message-header-format-alist to get around a bug in message.el.
-       ;; See the comment above on notmuch-mua-insert-references.
+       ;; We modify message-header-format-alist to get around
+       ;; a bug in message.el.  See the comment above on
+       ;; notmuch-mua-insert-references.

        (let ((message-header-format-alist
               (cl-loop for pair in message-header-format-alist
                        if (eq (car pair) 'References)
        (let ((message-header-format-alist
               (cl-loop for pair in message-header-format-alist
                        if (eq (car pair) 'References)


@@ -265,12 +262,11 @@ Typically this is added to `notmuch-mua-send-hook'."
                            (notmuch-sanitize (plist-get reply-headers :Subject))
                            (notmuch-headers-plist-to-alist reply-headers)
                            nil (notmuch-mua-get-switch-function))))
                            (notmuch-sanitize (plist-get reply-headers :Subject))
                            (notmuch-headers-plist-to-alist reply-headers)
                            nil (notmuch-mua-get-switch-function))))

-
-      ;; Create a buffer-local queue for tag changes triggered when sending the reply
+      ;; Create a buffer-local queue for tag changes triggered when
+      ;; sending the reply.

       (when notmuch-message-replied-tags
        (setq-local notmuch-message-queued-tag-changes
                    (list (cons query-string notmuch-message-replied-tags))))
       (when notmuch-message-replied-tags
        (setq-local notmuch-message-queued-tag-changes
                    (list (cons query-string notmuch-message-replied-tags))))

-

       ;; Insert the message body - but put it in front of the signature
       ;; if one is present, and after any other content
       ;; message*setup-hooks may have added to the message body already.
       ;; Insert the message body - but put it in front of the signature
       ;; if one is present, and after any other content
       ;; message*setup-hooks may have added to the message body already.


@@ -282,54 +278,49 @@ Typically this is added to `notmuch-mua-send-hook'."
            (if message-signature-insert-empty-line
                (forward-line -1))
          (goto-char (point-max))))
            (if message-signature-insert-empty-line
                (forward-line -1))
          (goto-char (point-max))))

-

       (let ((from (plist-get original-headers :From))
            (date (plist-get original-headers :Date))
            (start (point)))
       (let ((from (plist-get original-headers :From))
            (date (plist-get original-headers :Date))
            (start (point)))

-

        ;; notmuch-mua-cite-function constructs a citation line based
        ;; on the From and Date headers of the original message, which
        ;; are assumed to be in the buffer.
        (insert "From: " from "\n")
        (insert "Date: " date "\n\n")
        ;; notmuch-mua-cite-function constructs a citation line based
        ;; on the From and Date headers of the original message, which
        ;; are assumed to be in the buffer.
        (insert "From: " from "\n")
        (insert "Date: " date "\n\n")

-
-       (insert (with-temp-buffer
-                 (let
-                     ;; Don't attempt to clean up messages, excerpt
-                     ;; citations, etc. in the original message before
-                     ;; quoting.
-                     ((notmuch-show-insert-text/plain-hook nil)
-                      ;; Don't omit long parts.
-                      (notmuch-show-max-text-part-size 0)
-                      ;; Insert headers for parts as appropriate for replying.
-                      (notmuch-show-insert-header-p-function notmuch-mua-reply-insert-header-p-function)
-                      ;; Ensure that any encrypted parts are
-                      ;; decrypted during the generation of the reply
-                      ;; text.
-                      (notmuch-show-process-crypto process-crypto)
-                      ;; Don't indent multipart sub-parts.
-                      (notmuch-show-indent-multipart nil))
-                   ;; We don't want sigstatus buttons (an information leak and usually wrong anyway).
-                   (cl-letf (((symbol-function 'notmuch-crypto-insert-sigstatus-button) #'ignore)
-                             ((symbol-function 'notmuch-crypto-insert-encstatus-button) #'ignore))
-                     (notmuch-show-insert-body original (plist-get original :body) 0)
-                     (buffer-substring-no-properties (point-min) (point-max))))))
-
+       (insert
+        (with-temp-buffer
+          (let
+              ;; Don't attempt to clean up messages, excerpt
+              ;; citations, etc. in the original message before
+              ;; quoting.
+              ((notmuch-show-insert-text/plain-hook nil)
+               ;; Don't omit long parts.
+               (notmuch-show-max-text-part-size 0)
+               ;; Insert headers for parts as appropriate for replying.
+               (notmuch-show-insert-header-p-function
+                notmuch-mua-reply-insert-header-p-function)
+               ;; Ensure that any encrypted parts are
+               ;; decrypted during the generation of the reply
+               ;; text.
+               (notmuch-show-process-crypto process-crypto)
+               ;; Don't indent multipart sub-parts.
+               (notmuch-show-indent-multipart nil))
+            ;; We don't want sigstatus buttons (an information leak and usually wrong anyway).
+            (cl-letf (((symbol-function 'notmuch-crypto-insert-sigstatus-button) #'ignore)
+                      ((symbol-function 'notmuch-crypto-insert-encstatus-button) #'ignore))
+              (notmuch-show-insert-body original (plist-get original :body) 0)
+              (buffer-substring-no-properties (point-min) (point-max))))))

        (set-mark (point))
        (goto-char start)
        ;; Quote the original message according to the user's configured style.
        (funcall notmuch-mua-cite-function)))
        (set-mark (point))
        (goto-char start)
        ;; Quote the original message according to the user's configured style.
        (funcall notmuch-mua-cite-function)))

-

     ;; Crypto processing based crypto content of the original message
     (when process-crypto
       (notmuch-mua-reply-crypto (plist-get original :body))))
     ;; Crypto processing based crypto content of the original message
     (when process-crypto
       (notmuch-mua-reply-crypto (plist-get original :body))))

-

   ;; Push mark right before signature, if any.
   (message-goto-signature)
   (unless (eobp)
     (end-of-line -1))
   (push-mark)
   ;; Push mark right before signature, if any.
   (message-goto-signature)
   (unless (eobp)
     (end-of-line -1))
   (push-mark)

-

   (message-goto-body)
   (set-buffer-modified-p nil))
 
   (message-goto-body)
   (set-buffer-modified-p nil))
 


@@ -375,18 +366,18 @@ modified. This function is notmuch addaptation of
                                   return-action &rest ignored)
   "Invoke the notmuch mail composition window."
   (interactive)
                                   return-action &rest ignored)
   "Invoke the notmuch mail composition window."
   (interactive)

-

   (when notmuch-mua-user-agent-function
     (let ((user-agent (funcall notmuch-mua-user-agent-function)))
       (when (not (string= "" user-agent))
        (push (cons 'User-Agent user-agent) other-headers))))
   (when notmuch-mua-user-agent-function
     (let ((user-agent (funcall notmuch-mua-user-agent-function)))
       (when (not (string= "" user-agent))
        (push (cons 'User-Agent user-agent) other-headers))))

-

   (unless (assq 'From other-headers)
     (push (cons 'From (message-make-from
   (unless (assq 'From other-headers)
     (push (cons 'From (message-make-from

-                      (notmuch-user-name) (notmuch-user-primary-email))) other-headers))
-
+                      (notmuch-user-name)
+                      (notmuch-user-primary-email)))
+         other-headers))

   (notmuch-mua-pop-to-buffer (message-buffer-name "mail" to)
   (notmuch-mua-pop-to-buffer (message-buffer-name "mail" to)

-                            (or switch-function (notmuch-mua-get-switch-function)))
+                            (or switch-function
+                                (notmuch-mua-get-switch-function)))

   (let ((headers
         (append
          ;; The following is copied from `message-mail'
   (let ((headers
         (append
          ;; The following is copied from `message-mail'


@@ -413,7 +404,6 @@ modified. This function is notmuch addaptation of
   (message-hide-headers)
   (set-buffer-modified-p nil)
   (notmuch-mua-maybe-set-window-dedicated)
   (message-hide-headers)
   (set-buffer-modified-p nil)
   (notmuch-mua-maybe-set-window-dedicated)

-

   (message-goto-to))
 
 (defcustom notmuch-identities nil
   (message-goto-to))
 
 (defcustom notmuch-identities nil


@@ -470,8 +460,8 @@ If PROMPT-FOR-SENDER is non-nil, the user will be prompted for
 the From: address first."
   (interactive "P")
   (let ((other-headers
 the From: address first."
   (interactive "P")
   (let ((other-headers

-        (when (or prompt-for-sender notmuch-always-prompt-for-sender)
-          (list (cons 'From (notmuch-mua-prompt-for-sender))))))
+        (and (or prompt-for-sender notmuch-always-prompt-for-sender)
+             (list (cons 'From (notmuch-mua-prompt-for-sender))))))

     (notmuch-mua-mail nil nil other-headers nil (notmuch-mua-get-switch-function))))
 
 (defun notmuch-mua-new-forward-messages (messages &optional prompt-for-sender)
     (notmuch-mua-mail nil nil other-headers nil (notmuch-mua-get-switch-function))))
 
 (defun notmuch-mua-new-forward-messages (messages &optional prompt-for-sender)


@@ -480,16 +470,16 @@ the From: address first."
 If PROMPT-FOR-SENDER is non-nil, the user will be prompteed for
 the From: address."
   (let* ((other-headers
 If PROMPT-FOR-SENDER is non-nil, the user will be prompteed for
 the From: address."
   (let* ((other-headers

-         (when (or prompt-for-sender notmuch-always-prompt-for-sender)
-           (list (cons 'From (notmuch-mua-prompt-for-sender)))))
-        forward-subject  ;; Comes from the first message and is
-                         ;; applied later.
-        forward-references ;; List of accumulated message-references of forwarded messages
-        forward-queries) ;; List of corresponding message-query
-
+         (and (or prompt-for-sender notmuch-always-prompt-for-sender)
+              (list (cons 'From (notmuch-mua-prompt-for-sender)))))
+        ;; Comes from the first message and is applied later.
+        forward-subject
+        ;; List of accumulated message-references of forwarded messages.
+        forward-references
+        ;; List of corresponding message-query.
+        forward-queries)

     ;; Generate the template for the outgoing message.
     (notmuch-mua-mail nil "" other-headers nil (notmuch-mua-get-switch-function))
     ;; Generate the template for the outgoing message.
     (notmuch-mua-mail nil "" other-headers nil (notmuch-mua-get-switch-function))

-

     (save-excursion
       ;; Insert all of the forwarded messages.
       (mapc (lambda (id)
     (save-excursion
       ;; Insert all of the forwarded messages.
       (mapc (lambda (id)


@@ -499,7 +489,8 @@ the From: address."
                (with-current-buffer temp-buffer
                  (erase-buffer)
                  (let ((coding-system-for-read 'no-conversion))
                (with-current-buffer temp-buffer
                  (erase-buffer)
                  (let ((coding-system-for-read 'no-conversion))

-                   (call-process notmuch-command nil t nil "show" "--format=raw" id))
+                   (call-process notmuch-command nil t nil
+                                 "show" "--format=raw" id))

                  ;; Because we process the messages in reverse order,
                  ;; always generate a forwarded subject, then use the
                  ;; last (i.e. first) one.
                  ;; Because we process the messages in reverse order,
                  ;; always generate a forwarded subject, then use the
                  ;; last (i.e. first) one.


@@ -514,7 +505,6 @@ the From: address."
            ;; `message-forward-make-body' always puts the message at
            ;; the top, so do them in reverse order.
            (reverse messages))
            ;; `message-forward-make-body' always puts the message at
            ;; the top, so do them in reverse order.
            (reverse messages))

-

       ;; Add in the appropriate subject.
       (save-restriction
        (message-narrow-to-headers)
       ;; Add in the appropriate subject.
       (save-restriction
        (message-narrow-to-headers)


@@ -523,14 +513,13 @@ the From: address."
        (message-remove-header "References")
        (message-add-header (concat "References: "
                                    (mapconcat 'identity forward-references " "))))
        (message-remove-header "References")
        (message-add-header (concat "References: "
                                    (mapconcat 'identity forward-references " "))))

-
-      ;; Create a buffer-local queue for tag changes triggered when sending the message
+      ;; Create a buffer-local queue for tag changes triggered when
+      ;; sending the message.

       (when notmuch-message-forwarded-tags
        (setq-local notmuch-message-queued-tag-changes
                    (cl-loop for id in forward-queries
                             collect
                             (cons id notmuch-message-forwarded-tags))))
       (when notmuch-message-forwarded-tags
        (setq-local notmuch-message-queued-tag-changes
                    (cl-loop for id in forward-queries
                             collect
                             (cons id notmuch-message-forwarded-tags))))

-

       ;; `message-forward-make-body' shows the User-agent header.  Hide
       ;; it again.
       (message-hide-headers)
       ;; `message-forward-make-body' shows the User-agent header.  Hide
       ;; it again.
       (message-hide-headers)


@@ -542,22 +531,19 @@ the From: address."
 If PROMPT-FOR-SENDER is non-nil, the user will be prompted for
 the From: address first.  If REPLY-ALL is non-nil, the message
 will be addressed to all recipients of the source message."
 If PROMPT-FOR-SENDER is non-nil, the user will be prompted for
 the From: address first.  If REPLY-ALL is non-nil, the message
 will be addressed to all recipients of the source message."

-
-;; In current emacs (24.3) select-active-regions is set to t by
-;; default. The reply insertion code sets the region to the quoted
-;; message to make it easy to delete (kill-region or C-w). These two
-;; things combine to put the quoted message in the primary selection.
-;;
-;; This is not what the user wanted and is a privacy risk (accidental
-;; pasting of the quoted message). We can avoid some of the problems
-;; by let-binding select-active-regions to nil. This fixes if the
-;; primary selection was previously in a non-emacs window but not if
-;; it was in an emacs window. To avoid the problem in the latter case
-;; we deactivate mark.
-
-  (let ((sender
-        (when prompt-for-sender
-          (notmuch-mua-prompt-for-sender)))
+  ;; In current emacs (24.3) select-active-regions is set to t by
+  ;; default. The reply insertion code sets the region to the quoted
+  ;; message to make it easy to delete (kill-region or C-w). These two
+  ;; things combine to put the quoted message in the primary selection.
+  ;;
+  ;; This is not what the user wanted and is a privacy risk (accidental
+  ;; pasting of the quoted message). We can avoid some of the problems
+  ;; by let-binding select-active-regions to nil. This fixes if the
+  ;; primary selection was previously in a non-emacs window but not if
+  ;; it was in an emacs window. To avoid the problem in the latter case
+  ;; we deactivate mark.
+  (let ((sender (and prompt-for-sender
+                    (notmuch-mua-prompt-for-sender)))

        (select-active-regions nil))
     (notmuch-mua-reply query-string sender reply-all)
     (deactivate-mark)))
        (select-active-regions nil))
     (notmuch-mua-reply query-string sender reply-all)
     (deactivate-mark)))


@@ -609,7 +595,8 @@ unencrypted.  Really send? "))))
   (run-hooks 'notmuch-mua-send-hook)
   (when (and (notmuch-mua-check-no-misplaced-secure-tag)
             (notmuch-mua-check-secure-tag-has-newline))
   (run-hooks 'notmuch-mua-send-hook)
   (when (and (notmuch-mua-check-no-misplaced-secure-tag)
             (notmuch-mua-check-secure-tag-has-newline))

-    (cl-letf (((symbol-function 'message-do-fcc) #'notmuch-maildir-message-do-fcc))
+    (cl-letf (((symbol-function 'message-do-fcc)
+              #'notmuch-maildir-message-do-fcc))

       (if exit
          (message-send-and-exit arg)
        (message-send arg)))))
       (if exit
          (message-send-and-exit arg)
        (message-send arg)))))