X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch.el;h=34e439422cdb5415eba37638c0ff8f980b2b3cd6;hp=2e172aaecb432a7367894811e252c057a843834f;hb=54d79f60a19566493593c0399a27ced0f0aa72e2;hpb=97ef8a74c93fc24a65d97ae621f482450503db09

diff --git a/notmuch.el b/notmuch.el
index 2e172aae..34e43942 100644
--- a/notmuch.el
+++ b/notmuch.el
@@ -68,7 +68,7 @@
 (set 'notmuch-show-part-end-regexp         "part}")
 (set 'notmuch-show-marker-regexp "\\(message\\|header\\|body\\|attachment\\|part\\)[{}].*$")
 
-(set 'notmuch-show-id-regexp "id:\\([^ ]*\\)")
+(set 'notmuch-show-id-regexp "\\(id:[^ ]*\\)")
 (set 'notmuch-show-filename-regexp "filename:\\(.*\\)$")
 (set 'notmuch-show-tags-regexp "(\\([^)]*\\))$")
 
@@ -153,7 +153,7 @@ Unlike builtin `next-line' this version accepts no arguments."
   (apply 'notmuch-call-notmuch-process
 	 (append (cons "tag"
 		       (mapcar (lambda (s) (concat "+" s)) toadd))
-		 (cons (concat "id:" (notmuch-show-get-message-id)) nil)))
+		 (cons (notmuch-show-get-message-id) nil)))
   (notmuch-show-set-tags (sort (union toadd (notmuch-show-get-tags) :test 'string=) 'string<)))
 
 (defun notmuch-show-remove-tag (&rest toremove)
@@ -165,7 +165,7 @@ Unlike builtin `next-line' this version accepts no arguments."
 	  (apply 'notmuch-call-notmuch-process
 		 (append (cons "tag"
 			       (mapcar (lambda (s) (concat "-" s)) toremove))
-			 (cons (concat "id:" (notmuch-show-get-message-id)) nil)))
+			 (cons (notmuch-show-get-message-id) nil)))
 	  (notmuch-show-set-tags (sort (set-difference tags toremove :test 'string=) 'string<))))))
 
 (defun notmuch-show-archive-thread-maybe-mark-read (markread)
@@ -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"))))