[PATCH] contrib: pick: tidy up pick-format-field

[Mark Walters]

Previously this function used a temporary variable to store the return
value but we can just use the return value of the cond statement
directly.

The only tiny subtlety is that in one case (subject) we need to
slightly reorder the logic to make sure the formatted-field is the
last thing computed.
---
This follows Tomi's suggestion in id:m2ob7vg24n.fsf at guru.guru-group.fi                                                                                     and simplifies the code here slightly. This patch applies on top of                                                                                        the series at                                                                                                                                              id:1378092488-32050-1-git-send-email-markwalters1009 at gmail.com                                                                                             

(It also includes one small whitespace fix-up for the face for the tags)


 contrib/notmuch-pick/notmuch-pick.el |   49 ++++++++++++++-------------------
 1 files changed, 21 insertions(+), 28 deletions(-)

diff --git a/contrib/notmuch-pick/notmuch-pick.el b/contrib/notmuch-pick/notmuch-pick.el
index cba9549..17fe395 100644
--- a/contrib/notmuch-pick/notmuch-pick.el
+++ b/contrib/notmuch-pick/notmuch-pick.el
@@ -682,20 +682,16 @@ unchanged ADDRESS if parsing fails."
 (defun notmuch-pick-format-field (field format-string msg)
   "Format a FIELD of MSG according to FORMAT-STRING and return string"
   (let* ((headers (plist-get msg :headers))
-	(match (plist-get msg :match))
-	formatted-field)
+	 (match (plist-get msg :match)))
     (cond
      ((listp field)
-      (setq formatted-field
-	    (format format-string (notmuch-pick-format-field-list field msg))))
+      (format format-string (notmuch-pick-format-field-list field msg)))
 
      ((string-equal field "date")
       (let ((face (if match
 		      'notmuch-pick-match-date-face
 		    'notmuch-pick-no-match-date-face)))
-	(setq formatted-field
-	      (propertize (format format-string (plist-get msg :date_relative))
-			  'face face))))
+	(propertize (format format-string (plist-get msg :date_relative)) 'face face)))
 
      ((string-equal field "tree")
       (let ((tree-status (plist-get msg :tree-status))
@@ -703,23 +699,23 @@ unchanged ADDRESS if parsing fails."
 		      'notmuch-pick-match-tree-face
 		    'notmuch-pick-no-match-tree-face)))
 
-	(setq formatted-field
-	      (propertize (format format-string
-				  (mapconcat #'identity (reverse tree-status) ""))
-			  'face face))))
+	(propertize (format format-string
+			    (mapconcat #'identity (reverse tree-status) ""))
+		    'face face)))
 
      ((string-equal field "subject")
       (let ((bare-subject (notmuch-show-strip-re (plist-get headers :Subject)))
+	    (previous-subject notmuch-pick-previous-subject)
 	    (face (if match
 		      'notmuch-pick-match-subject-face
 		    'notmuch-pick-no-match-subject-face)))
-	(setq formatted-field
-	      (propertize (format format-string
-				  (if (string= notmuch-pick-previous-subject bare-subject)
-				      " ..."
-				    bare-subject))
-			  'face face))
-	(setq notmuch-pick-previous-subject bare-subject)))
+
+	(setq notmuch-pick-previous-subject bare-subject)
+	(propertize (format format-string
+			    (if (string= previous-subject bare-subject)
+				" ..."
+			      bare-subject))
+		    'face face)))
 
      ((string-equal field "authors")
       (let ((author (notmuch-pick-clean-address (plist-get headers :From)))
@@ -729,20 +725,17 @@ unchanged ADDRESS if parsing fails."
 		    'notmuch-pick-no-match-author-face)))
 	(when (> (length author) len)
 	  (setq author (substring author 0 len)))
-	(setq formatted-field
-	      (propertize (format format-string author)
-			  'face face))))
+	(propertize (format format-string author) 'face face)))
 
      ((string-equal field "tags")
       (let ((tags (plist-get msg :tags))
 	    (face (if match
-			  'notmuch-pick-match-tag-face
-			'notmuch-pick-no-match-tag-face)))
-	(setq formatted-field
-	      (propertize (format format-string
-				  (mapconcat #'identity tags ", "))
-			  'face face)))))
-    formatted-field))
+		      'notmuch-pick-match-tag-face
+		    'notmuch-pick-no-match-tag-face)))
+	(propertize (format format-string
+			    (mapconcat #'identity tags ", "))
+		    'face face))))))
+
 
 (defun notmuch-pick-format-field-list (field-list msg)
   "Format fields of MSG according to FIELD-LIST and return string"
-- 
1.7.9.1