X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch.el;h=c8639be529207fc85420e25be527712b590a1348;hp=0eac1ccbed60efa586cdea6eafa223b2373127ac;hb=c5dccd851a8b79d8cedbfc8f2d2b8f9be2b7fa5a;hpb=ab68891bec06e793b517b108414df46a47284aad

diff --git a/notmuch.el b/notmuch.el
index 0eac1ccb..c8639be5 100644
--- a/notmuch.el
+++ b/notmuch.el
@@ -184,6 +184,7 @@ Unlike builtin `next-line' this version accepts no arguments."
     (if parent-buffer
 	(progn
 	  (switch-to-buffer parent-buffer)
+	  (forward-line)
 	  (notmuch-search-show-thread)))))
 
 (defun notmuch-show-mark-read-then-archive-thread ()
@@ -408,7 +409,7 @@ which this thread was originally shown."
 	      (overlay-put overlay 'invisible 'notmuch-show-citation)
 	      (overlay-put overlay 'before-string
 			   (concat "[" (number-to-string (count-lines beg-sub (point)))
-				   " quoted lines.]\n")))))
+				   "-line citation. Press 'c' to show.]\n")))))
       (if (looking-at "--[ ]?$")
 	  (let ((sig-lines (count-lines beg-sub end)))
 	    (if (<= sig-lines notmuch-show-signature-lines-max)
@@ -416,7 +417,7 @@ which this thread was originally shown."
 		  (overlay-put (make-overlay beg-sub (+ beg-sub 1))
 			       'before-string
 			       (concat "[" (number-to-string sig-lines)
-				       "-line signature.]"))
+				       "-line signature. Press 's' to show.]"))
 		  (overlay-put (make-overlay (+ beg-sub 2) end)
 			       'invisible 'notmuch-show-signature)
 		  (goto-char end)))))
@@ -436,9 +437,15 @@ which this thread was originally shown."
 
 (defun notmuch-show-markup-header ()
   (re-search-forward notmuch-show-header-begin-regexp)
-  (next-line 2)
+  (forward-line 1)
   (beginning-of-line)
   (let ((beg (point)))
+    (end-of-line)
+    ; Inverse video for subject
+    (overlay-put (make-overlay beg (point)) 'face '((cons :inverse-video t)))
+    (beginning-of-line)
+    (forward-line 2)
+    (set 'beg (point))
     (re-search-forward notmuch-show-header-end-regexp)
     (overlay-put (make-overlay beg (match-beginning 0))
 		 'invisible 'notmuch-show-header)))
@@ -674,15 +681,16 @@ global search.
   (save-excursion
     (beginning-of-line)
     (let ((beg (point)))
-      (re-search-forward "thread:[a-fA-F0-9]*")
+      (re-search-forward "thread:[a-fA-F0-9]*" nil t)
       (filter-buffer-substring beg (point)))))
 
 (defun notmuch-search-markup-this-thread-id ()
   (beginning-of-line)
   (let ((beg (point)))
-    (re-search-forward "thread:[a-fA-F0-9]*")
-    (forward-char)
-    (overlay-put (make-overlay beg (point)) 'invisible 'notmuch-search)))
+    (if (re-search-forward "thread:[a-fA-F0-9]*" nil t)
+	(progn
+	  (forward-char)
+	  (overlay-put (make-overlay beg (point)) 'invisible 'notmuch-search)))))
 
 (defun notmuch-search-markup-thread-ids ()
   (save-excursion
@@ -706,7 +714,6 @@ global search.
 (defun notmuch-search-show-thread ()
   (interactive)
   (let ((thread-id (notmuch-search-find-thread-id)))
-    (forward-line)
     (if (> (length thread-id) 0)
 	(notmuch-show thread-id (current-buffer))
       (error "End of search results"))))
@@ -752,12 +759,12 @@ and will also appear in a buffer named \"*Notmuch errors*\"."
 
 (defun notmuch-search-add-tag (tag)
   (interactive "sTag to add: ")
-  (notmuch-call-notmuch-process "tag" (concat "+" tag) (concat "thread:" (notmuch-search-find-thread-id)))
+  (notmuch-call-notmuch-process "tag" (concat "+" tag) (notmuch-search-find-thread-id))
   (notmuch-search-set-tags (delete-dups (sort (cons tag (notmuch-search-get-tags)) 'string<))))
 
 (defun notmuch-search-remove-tag (tag)
   (interactive "sTag to remove: ")
-  (notmuch-call-notmuch-process "tag" (concat "-" tag) (concat "thread:" (notmuch-search-find-thread-id)))
+  (notmuch-call-notmuch-process "tag" (concat "-" tag) (notmuch-search-find-thread-id))
   (notmuch-search-set-tags (delete tag (notmuch-search-get-tags))))
 
 (defun notmuch-search-archive-thread ()