X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=emacs%2Fnotmuch.el;h=89361498f8e27b38ad769667c17794485c051f31;hb=518d4ef7d0a45e7b9a63a377892daf9b7f2f6791;hp=c1827cc2691f66cb0f566668fede9116bfb62776;hpb=07022714ebd7e54aaa276d1c6f395fb8347a0710;p=notmuch

diff --git a/emacs/notmuch.el b/emacs/notmuch.el
index c1827cc2..89361498 100644
--- a/emacs/notmuch.el
+++ b/emacs/notmuch.el
@@ -805,12 +805,12 @@ non-authors is found, assume that all of the authors match."
 		      (goto-char (point-max))
 		      (if (/= (match-beginning 1) line)
 			  (insert (concat "Error: Unexpected output from notmuch search:\n" (substring string line (match-beginning 1)) "\n")))
-		      (let ((beg (point-marker)))
+		      (let ((beg (point)))
 			(notmuch-search-show-result date count authors subject tags)
-			(notmuch-search-color-line beg (point-marker) tag-list)
-			(put-text-property beg (point-marker) 'notmuch-search-thread-id thread-id)
-			(put-text-property beg (point-marker) 'notmuch-search-authors authors)
-			(put-text-property beg (point-marker) 'notmuch-search-subject subject)
+			(notmuch-search-color-line beg (point) tag-list)
+			(put-text-property beg (point) 'notmuch-search-thread-id thread-id)
+			(put-text-property beg (point) 'notmuch-search-authors authors)
+			(put-text-property beg (point) 'notmuch-search-subject subject)
 			(if (string= thread-id notmuch-search-target-thread)
 			    (progn
 			      (set 'found-target beg)
@@ -885,7 +885,7 @@ PROMPT is the string to prompt with."
 		      "subject:" "attachment:")
 		(mapcar (lambda (tag)
 			  (concat "tag:" tag))
-			(process-lines "notmuch" "search" "--output=tags" "*")))))
+			(process-lines notmuch-command "search" "--output=tags" "*")))))
     (let ((keymap (copy-keymap minibuffer-local-map))
 	  (minibuffer-completion-table
 	   (completion-table-dynamic
@@ -920,6 +920,8 @@ The optional parameters are used as follows:
   (let ((buffer (get-buffer-create (notmuch-search-buffer-title query))))
     (switch-to-buffer buffer)
     (notmuch-search-mode)
+    ;; Don't track undo information for this buffer
+    (set 'buffer-undo-list t)
     (set 'notmuch-search-query-string query)
     (set 'notmuch-search-oldest-first oldest-first)
     (set 'notmuch-search-target-thread target-thread)