(make-variable-buffer-local 'notmuch-pick-query-context)
(defvar notmuch-pick-target-msg nil)
(make-variable-buffer-local 'notmuch-pick-target-msg)
+(defvar notmuch-pick-open-target nil)
+(make-variable-buffer-local 'notmuch-pick-open-target)
(defvar notmuch-pick-buffer-name nil)
(make-variable-buffer-local 'notmuch-pick-buffer-name)
;; This variable is the window used for the message pane. It is set
(defun notmuch-pick-tag (&optional tag-changes)
"Change tags for the current message"
(interactive)
- (setq tag-changes (funcall 'notmuch-tag (notmuch-pick-get-message-id) tag-changes))
+ (setq tag-changes (notmuch-tag (notmuch-pick-get-message-id) tag-changes))
(notmuch-pick-tag-update-display tag-changes))
(defun notmuch-pick-add-tag ()
(notmuch-pick (notmuch-search-find-thread-id)
notmuch-search-query-string
nil
- (notmuch-prettify-subject (notmuch-search-find-subject)))
- (notmuch-pick-show-match-message-with-wait))
+ (notmuch-prettify-subject (notmuch-search-find-subject))
+ t))
(defun notmuch-pick-message-window-kill-hook ()
(let ((buffer (current-buffer)))
(split-window-vertically (/ (window-height) 4)))
(with-selected-window notmuch-pick-message-window
;; Since we are only displaying one message do not indent.
- (let ((notmuch-show-indent-messages-width 0))
- (setq current-prefix-arg '(4))
+ (let ((notmuch-show-indent-messages-width 0)
+ (notmuch-show-only-matching-messages t))
(setq buffer (notmuch-show id nil nil nil))))
;; We need the `let' as notmuch-pick-message-window is buffer local.
(let ((window notmuch-pick-message-window))
(with-current-buffer buffer
(setq notmuch-pick-message-window window)
(add-hook 'kill-buffer-hook 'notmuch-pick-message-window-kill-hook)))
- (notmuch-pick-tag-update-display (list "-unread"))
+ (when notmuch-show-mark-read-tags
+ (notmuch-pick-tag-update-display notmuch-show-mark-read-tags))
(setq notmuch-pick-message-buffer buffer))))
(defun notmuch-pick-show-message-out ()
"Archive the current message.
Archive the current message by applying the tag changes in
-`notmuch-archive-tags' to it (remove the \"inbox\" tag by
-default). If a prefix argument is given, the message will be
-\"unarchived\", i.e. the tag changes in `notmuch-archive-tags'
-will be reversed."
+`notmuch-archive-tags' to it. If a prefix argument is given, the
+message will be \"unarchived\", i.e. the tag changes in
+`notmuch-archive-tags' will be reversed."
(interactive "P")
(when notmuch-archive-tags
(apply 'notmuch-pick-tag
(when (window-live-p notmuch-pick-message-window)
(notmuch-pick-show-message)))
-(defun notmuch-pick-show-match-message-with-wait ()
- "Show the first matching message but wait for it to appear or search to finish."
- (interactive)
- (unless (notmuch-pick-get-match)
- (notmuch-pick-next-matching-message))
- (while (and (not (notmuch-pick-get-match))
- (get-buffer-process (current-buffer)))
- (message "waiting for message")
- (sit-for 0.1)
- (goto-char (point-min))
- (unless (notmuch-pick-get-match)
- (notmuch-pick-next-matching-message)))
- (message nil)
- (when (notmuch-pick-get-match)
- (notmuch-pick-show-message)))
-
(defun notmuch-pick-refresh-view ()
"Refresh view."
(interactive)
(save-excursion
(goto-char (point-max))
(notmuch-pick-insert-msg msg))
- (let ((msg-id (notmuch-id-to-query (plist-get msg :id))))
- (when (string= msg-id notmuch-pick-target-msg)
+ (let ((msg-id (notmuch-id-to-query (plist-get msg :id)))
+ (target notmuch-pick-target-msg))
+ (when (or (and (not target) (plist-get msg :match))
+ (string= msg-id target))
(setq notmuch-pick-target-msg "found")
(goto-char (point-max))
- (forward-line -1))))
+ (forward-line -1)
+ (when notmuch-pick-open-target
+ (notmuch-pick-show-message)))))
(defun notmuch-pick-insert-tree (tree depth tree-status first last)
"Insert the message tree TREE at depth DEPTH in the current thread."
(save-excursion
(goto-char (point-max))
(insert string))
- (notmuch-json-parse-partial-list 'notmuch-pick-insert-forest-thread
- 'notmuch-pick-show-error
+ (notmuch-sexp-parse-partial-list 'notmuch-pick-insert-forest-thread
results-buf)))))
-(defun notmuch-pick-worker (basic-query &optional query-context target buffer)
+(defun notmuch-pick-worker (basic-query &optional query-context target buffer open-target)
(interactive)
(notmuch-pick-mode)
(setq notmuch-pick-basic-query basic-query)
(setq notmuch-pick-query-context query-context)
(setq notmuch-pick-buffer-name (buffer-name buffer))
(setq notmuch-pick-target-msg target)
+ (setq notmuch-pick-open-target open-target)
(erase-buffer)
(goto-char (point-min))
(if notmuch-pick-asynchronous-parser
(let ((proc (start-process
"notmuch-pick" buffer
- notmuch-command "show" "--body=false" "--format=json"
+ notmuch-command "show" "--body=false" "--format=sexp"
message-arg search-args))
;; Use a scratch buffer to accumulate partial output.
;; This buffer will be killed by the sentinel, which
(insert "End of search results.\n"))))))
-(defun notmuch-pick (&optional query query-context target buffer-name show-first-match)
+(defun notmuch-pick (&optional query query-context target buffer-name open-target)
"Run notmuch pick with the given `query' and display the results"
(interactive "sNotmuch pick: ")
(if (null query)
;; Don't track undo information for this buffer
(set 'buffer-undo-list t)
- (notmuch-pick-worker query query-context target buffer)
+ (notmuch-pick-worker query query-context target buffer open-target)
- (setq truncate-lines t)
- (when show-first-match
- (notmuch-pick-show-match-message-with-wait))))
+ (setq truncate-lines t)))
;; Set up key bindings from the rest of notmuch.
projects / notmuch / blobdiff