X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=emacs%2Fnotmuch-lib.el;h=98056eb6558737bdec0bd64ba6fc031915ddf2f9;hp=7994d5ad03c22d4938535fe2fad5fa299e079e99;hb=dfb1b8eb89e814f4bf6f6e62b700c72aa1b4659a;hpb=caaa10876046096320f4e69053542eabe17e7e55

diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el
index 7994d5ad..98056eb6 100644
--- a/emacs/notmuch-lib.el
+++ b/emacs/notmuch-lib.el
@@ -555,13 +555,11 @@ This replaces spaces, percents, and double quotes in STR with
       (string= (downcase t1) (downcase t2)))))
 
 (defvar notmuch-multipart/alternative-discouraged
-  '(
-    ;; Avoid HTML parts.
+  '(;; Avoid HTML parts.
     "text/html"
     ;; multipart/related usually contain a text/html part and some
     ;; associated graphics.
-    "multipart/related"
-    ))
+    "multipart/related"))
 
 (defun notmuch-multipart/alternative-determine-discouraged (msg)
   "Return the discouraged alternatives for the specified message."
@@ -610,7 +608,7 @@ the given type."
 		       (set-buffer-multibyte nil))
 		     (let ((args `("show" "--format=raw"
 				   ,(format "--part=%s" (plist-get part :id))
-				   ,@(when process-crypto '("--decrypt=true"))
+				   ,@(and process-crypto '("--decrypt=true"))
 				   ,(notmuch-id-to-query (plist-get msg :id))))
 			   (coding-system-for-read
 			    (if binaryp 'no-conversion
@@ -783,8 +781,8 @@ signaled error.  This function does not return."
 	(insert extra)
 	(unless (bolp)
 	  (newline)))))
-  (error "%s" (concat msg (when extra
-			    " (see *Notmuch errors* for more details)"))))
+  (error "%s"
+	 (concat msg (and extra " (see *Notmuch errors* for more details)"))))
 
 (defun notmuch-check-async-exit-status (proc msg &optional command err)
   "If PROC exited abnormally, pop up an error buffer and signal an error.
@@ -838,10 +836,8 @@ You may need to restart Emacs or upgrade your notmuch package."))
 		    (if (integerp exit-status)
 			(format "exit status: %s\n" exit-status)
 		      (format "exit signal: %s\n" exit-status))
-		    (when err
-		      (concat "stderr:\n" err))
-		    (when output
-		      (concat "stdout:\n" output)))))
+		    (and err    (concat "stderr:\n" err))
+		    (and output (concat "stdout:\n" output)))))
       (if err
 	  ;; We have an error message straight from the CLI.
 	  (notmuch-logged-error
@@ -863,8 +859,8 @@ for `call-process'.  ARGS is as described for
   (let (stdin-string)
     (while (keywordp (car args))
       (cl-case (car args)
-	(:stdin-string (setq stdin-string (cadr args)
-			     args (cddr args)))
+	(:stdin-string (setq stdin-string (cadr args))
+		       (setq args (cddr args)))
 	(otherwise
 	 (error "Unknown keyword argument: %s" (car args)))))
     (if (null stdin-string)
@@ -941,8 +937,8 @@ status."
 		      :buffer buffer
 		      :command (cons command args)
 		      :connection-type 'pipe
-		      :stderr err-buffer)
-		err-proc (get-buffer-process err-buffer))
+		      :stderr err-buffer))
+	  (setq err-proc (get-buffer-process err-buffer))
 	  (process-put proc 'err-buffer err-buffer)
 
 	  (process-put err-proc 'err-file err-file)
@@ -970,8 +966,8 @@ status."
   (let* ((err-file (process-get proc 'err-file))
 	 (err-buffer (or (process-get proc 'err-buffer)
 			 (find-file-noselect err-file)))
-	 (err (when (not (zerop (buffer-size err-buffer)))
-		(with-current-buffer err-buffer (buffer-string))))
+	 (err (and (not (zerop (buffer-size err-buffer)))
+		   (with-current-buffer err-buffer (buffer-string))))
 	 (sub-sentinel (process-get proc 'sub-sentinel))
 	 (real-command (process-get proc 'real-command)))
     (condition-case err
@@ -989,16 +985,17 @@ status."
 	  ;; If that didn't signal an error, then any error output was
 	  ;; really warning output.  Show warnings, if any.
 	  (let ((warnings
-		 (when err
-		   (with-current-buffer err-buffer
-		     (goto-char (point-min))
-		     (end-of-line)
-		     ;; Show first line; stuff remaining lines in the
-		     ;; errors buffer.
-		     (let ((l1 (buffer-substring (point-min) (point))))
-		       (skip-chars-forward "\n")
-		       (cons l1 (unless (eobp)
-				  (buffer-substring (point) (point-max)))))))))
+		 (and err
+		      (with-current-buffer err-buffer
+			(goto-char (point-min))
+			(end-of-line)
+			;; Show first line; stuff remaining lines in the
+			;; errors buffer.
+			(let ((l1 (buffer-substring (point-min) (point))))
+			  (skip-chars-forward "\n")
+			  (cons l1 (and (not (eobp))
+					(buffer-substring (point)
+							  (point-max)))))))))
 	    (when warnings
 	      (notmuch-logged-error (car warnings) (cdr warnings)))))
       (error