X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch.el;h=c8639be529207fc85420e25be527712b590a1348;hp=4e649d441401239b9ddafa9258ade2d838b56acf;hb=c5dccd851a8b79d8cedbfc8f2d2b8f9be2b7fa5a;hpb=306e19f5ddec1b10a0e99ccc54823544187e7ac3

diff --git a/notmuch.el b/notmuch.el
index 4e649d44..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 ()
@@ -713,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"))))
@@ -759,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 ()