X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=emacs%2Fnotmuch.el;h=2a87ab92ca5261013e6407914f2413256ed3fbf3;hb=d064bd696ccc443a7ece9cfc8816999c69943223;hp=8d69fc8751082b12fedea6e042c066e33f9b77a2;hpb=c506e1034b5adb54b3e4f8d3e59086756f2bb126;p=notmuch

diff --git a/emacs/notmuch.el b/emacs/notmuch.el
index 8d69fc87..2a87ab92 100644
--- a/emacs/notmuch.el
+++ b/emacs/notmuch.el
@@ -329,7 +329,6 @@ For a mouse binding, return nil."
   "Face used in search mode face for tags."
   :group 'notmuch)
 
-;;;###autoload
 (defun notmuch-search-mode ()
   "Major mode displaying results of a notmuch search.
 
@@ -575,9 +574,10 @@ This function advances the next thread when finished."
 			(if (and atbob
 				 (not (string= notmuch-search-target-thread "found")))
 			    (set 'never-found-target-thread t))))))
-	      (if (and never-found-target-thread
+	      (when (and never-found-target-thread
 		       notmuch-search-target-line)
-		  (goto-line notmuch-search-target-line)))))))
+		  (goto-char (point-min))
+		  (forward-line (1- notmuch-search-target-line))))))))
 
 (defcustom notmuch-search-line-faces nil
   "Tag/face mapping for line highlighting in notmuch-search.
@@ -585,28 +585,33 @@ This function advances the next thread when finished."
 Here is an example of how to color search results based on tags.
  (the following text would be placed in your ~/.emacs file):
 
- (setq notmuch-search-line-faces '((\"delete\" . '(:foreground \"red\"))
+ (setq notmuch-search-line-faces '((\"delete\" . '(:foreground \"red\"
+						   :background \"blue\"))
                                    (\"unread\" . '(:foreground \"green\"))))
 
-Order matters: for lines with multiple tags, the the first
-matching will be applied."
+The attributes defined for matching tags are merged, with later
+attributes overriding earlier. A message having both \"delete\"
+and \"unread\" tags with the above settings would have a green
+foreground and blue background."
   :type '(alist :key-type (string) :value-type (list))
   :group 'notmuch)
 
 (defun notmuch-search-color-line (start end line-tag-list)
-  "Colorize lines in notmuch-show based on tags"
-  (if notmuch-search-line-faces
-      (let ((overlay (make-overlay start end))
-	    (tags-faces (copy-alist notmuch-search-line-faces)))
-	(while tags-faces
-	  (let* ((tag-face (car tags-faces))
-		 (tag (car tag-face))
-		 (face (cdr tag-face)))
-	    (cond ((member tag line-tag-list)
-		   (overlay-put overlay 'face face)
-		   (setq tags-faces nil))
-		  (t
-		   (setq tags-faces (cdr tags-faces)))))))))
+  "Colorize lines in `notmuch-show' based on tags."
+  ;; Create the overlay only if the message has tags which match one
+  ;; of those specified in `notmuch-search-line-faces'.
+  (let (overlay)
+    (mapc '(lambda (elem)
+	     (let ((tag (car elem))
+		   (attributes (cdr elem)))
+	       (when (member tag line-tag-list)
+		 (when (not overlay)
+		   (setq overlay (make-overlay start end)))
+		 ;; Merge the specified properties with any already
+		 ;; applied from an earlier match.
+		 (overlay-put overlay 'face
+			      (append (overlay-get overlay 'face) attributes)))))
+	  notmuch-search-line-faces)))
 
 (defun notmuch-search-isearch-authors-show (overlay)
   (remove-from-invisibility-spec (cons (overlay-get overlay 'invisible) t)))
@@ -794,10 +799,13 @@ The optional parameters are used as follows:
       (erase-buffer)
       (goto-char (point-min))
       (save-excursion
-	(let ((proc (start-process-shell-command
-		     "notmuch-search" buffer notmuch-command "search"
-		     (if oldest-first "--sort=oldest-first" "--sort=newest-first")
-		     (shell-quote-argument query))))
+	(let ((proc (start-process
+		     "notmuch-search" buffer
+		     notmuch-command "search"
+		     (if oldest-first
+			 "--sort=oldest-first"
+		       "--sort=newest-first")
+		     query)))
 	  (set-process-sentinel proc 'notmuch-search-process-sentinel)
 	  (set-process-filter proc 'notmuch-search-process-filter))))
     (run-hooks 'notmuch-search-hook)))