X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=emacs%2Fnotmuch-mua.el;h=2910a63e571830c6adbe8a1ac9cb1c7ca31b0b3f;hp=dc1f518caf03c784b134cf6728ae04ac7a068e14;hb=e1a700067a22214f54064c281219fbbbef87de06;hpb=09f6533c3781b61ea634790d4bad38aadf89115c

diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el
index dc1f518c..2910a63e 100644
--- a/emacs/notmuch-mua.el
+++ b/emacs/notmuch-mua.el
@@ -275,8 +275,8 @@ Typically this is added to `notmuch-mua-send-hook'."
 	(narrow-to-region (point) (point-max))
 	(goto-char (point-max))
 	(if (re-search-backward message-signature-separator nil t)
-	    (if message-signature-insert-empty-line
-		(forward-line -1))
+	    (when 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))
@@ -388,7 +388,8 @@ modified. This function is notmuch addaptation of
 	  ;; https://lists.gnu.org/archive/html/emacs-devel/2011-01/msg00337.html
 	  ;; We need to convert any string input, eg from rmail-start-mail.
 	  (dolist (h other-headers other-headers)
-	    (if (stringp (car h)) (setcar h (intern (capitalize (car h))))))))
+	    (when (stringp (car h))
+	      (setcar h (intern (capitalize (car h))))))))
 	(args (list yank-action send-actions))
 	;; Cause `message-setup-1' to do things relevant for mail,
 	;; such as observe `message-default-mail-headers'.
@@ -428,14 +429,15 @@ the From: header is already filled in by notmuch."
 ;; without some explicit initialization fill freeze the operation.
 ;; Hence, we advice `ido-completing-read' to ensure required initialization
 ;; is done.
-(if (and (= emacs-major-version 23) (< emacs-minor-version 4))
-    (defadvice ido-completing-read (before notmuch-ido-mode-init activate)
-      (ido-init-completion-maps)
-      (add-hook 'minibuffer-setup-hook 'ido-minibuffer-setup)
-      (add-hook 'choose-completion-string-functions
-		'ido-choose-completion-string)
-      (ad-disable-advice 'ido-completing-read 'before 'notmuch-ido-mode-init)
-      (ad-activate 'ido-completing-read)))
+(when (and (= emacs-major-version 23)
+	   (< emacs-minor-version 4))
+  (defadvice ido-completing-read (before notmuch-ido-mode-init activate)
+    (ido-init-completion-maps)
+    (add-hook 'minibuffer-setup-hook 'ido-minibuffer-setup)
+    (add-hook 'choose-completion-string-functions
+	      'ido-choose-completion-string)
+    (ad-disable-advice 'ido-completing-read 'before 'notmuch-ido-mode-init)
+    (ad-activate 'ido-completing-read)))
 
 (defun notmuch-mua-prompt-for-sender ()
   "Prompt for a sender from the user's configured identities."