From: Mark Walters <markwalters1009@gmail.com>
To: notmuch@notmuchmail.org
Subject: [PATCH 2/2] contrib: pick: add a target message for pick
Date: Thu, 10 Jan 2013 10:41:17 +0000 [thread overview]
Message-ID: <1357814477-1348-3-git-send-email-markwalters1009@gmail.com> (raw)
In-Reply-To: <1357814477-1348-1-git-send-email-markwalters1009@gmail.com>
This adds a target message for pick which it will jump to when (if) it
appears. It adds the target to notmuch-pick-from-show-current-query so
that pick goes straight to the message that was current in the show
view and it adds target to notmuch-pick-refresh-view so that the
current message is preserved.
---
contrib/notmuch-pick/notmuch-pick.el | 28 ++++++++++++++++++++++------
1 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/contrib/notmuch-pick/notmuch-pick.el b/contrib/notmuch-pick/notmuch-pick.el
index d597126..974223d 100644
--- a/contrib/notmuch-pick/notmuch-pick.el
+++ b/contrib/notmuch-pick/notmuch-pick.el
@@ -155,6 +155,8 @@
;; The context of the search: i.e., useful but can be dropped.
(defvar notmuch-pick-query-context nil)
(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-buffer-name nil)
(make-variable-buffer-local 'notmuch-pick-buffer-name)
;; This variable is the window used for the message pane. It is set
@@ -328,7 +330,9 @@ Does NOT change the database."
(defun notmuch-pick-from-show-current-query ()
"Call notmuch pick with the current query"
(interactive)
- (notmuch-pick notmuch-show-thread-id notmuch-show-query-context))
+ (notmuch-pick notmuch-show-thread-id
+ notmuch-show-query-context
+ (notmuch-show-get-message-id)))
;; This function should be in notmuch.el but be we trying to minimise
;; impact on the rest of the codebase.
@@ -344,6 +348,7 @@ Does NOT change the database."
(interactive)
(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))
@@ -506,9 +511,13 @@ will be reversed."
(let ((inhibit-read-only t)
(basic-query notmuch-pick-basic-query)
(query-context notmuch-pick-query-context)
+ (target (notmuch-pick-get-message-id))
(buffer-name notmuch-pick-buffer-name))
(erase-buffer)
- (notmuch-pick-worker basic-query query-context (get-buffer buffer-name))))
+ (notmuch-pick-worker basic-query
+ query-context
+ target
+ (get-buffer buffer-name))))
(defmacro with-current-notmuch-pick-message (&rest body)
"Evaluate body with current buffer set to the text of current message"
@@ -639,10 +648,16 @@ unchanged ADDRESS if parsing fails."
(insert "\n"))
(defun notmuch-pick-goto-and-insert-msg (msg)
- "Insert msg at the end of the buffer."
+ "Insert msg at the end of the buffer. Move point to msg if it is the target"
(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)
+ (setq notmuch-pick-target-msg "found")
+ (goto-char (point-max))
+ (forward-line -1))))
+
(defun notmuch-pick-insert-tree (tree depth tree-status first last)
"Insert the message tree TREE at depth DEPTH in the current thread."
(let ((msg (car tree))
@@ -762,12 +777,13 @@ Complete list of currently available key bindings:
'notmuch-pick-show-error
results-buf)))))
-(defun notmuch-pick-worker (basic-query &optional query-context buffer)
+(defun notmuch-pick-worker (basic-query &optional query-context target buffer)
(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)
(erase-buffer)
(goto-char (point-min))
@@ -799,7 +815,7 @@ Complete list of currently available key bindings:
(insert "End of search results.\n"))))))
-(defun notmuch-pick (&optional query query-context buffer-name show-first-match)
+(defun notmuch-pick (&optional query query-context target buffer-name show-first-match)
"Run notmuch pick with the given `query' and display the results"
(interactive "sNotmuch pick: ")
(if (null query)
@@ -813,7 +829,7 @@ Complete list of currently available key bindings:
;; Don't track undo information for this buffer
(set 'buffer-undo-list t)
- (notmuch-pick-worker query query-context buffer)
+ (notmuch-pick-worker query query-context target buffer)
(setq truncate-lines t)
(when show-first-match
--
1.7.9.1
next prev parent reply other threads:[~2013-01-10 10:41 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-10 10:41 [PATCH 0/2] contrib: pick: allow target message Mark Walters
2013-01-10 10:41 ` [PATCH 1/2] contrib: pick: move save-excursion closer to message insertion Mark Walters
2013-05-20 18:04 ` David Bremner
2013-01-10 10:41 ` Mark Walters [this message]
2013-01-10 11:14 ` [PATCH (corrected)] contrib: pick: add a target message for pick Mark Walters
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1357814477-1348-3-git-send-email-markwalters1009@gmail.com \
--to=markwalters1009@gmail.com \
--cc=notmuch@notmuchmail.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).