aboutsummaryrefslogtreecommitdiffhomepage
path: root/emacs/notmuch.el
diff options
context:
space:
mode:
authorGravatar Mark Walters <markwalters1009@gmail.com>2014-06-23 22:06:46 +0100
committerGravatar David Bremner <david@tethera.net>2014-07-15 20:32:49 -0300
commitf47eeac0b0186c3559eb559c4f0bee0e1fac1961 (patch)
treef19c3ee157db852d9252e1ab8d5e2625ee28de14 /emacs/notmuch.el
parent7f2bbe93a557c22277b46ad6048742222d80ed68 (diff)
emacs: set default in notmuch-read-query
This adds the current query as a "default value" to notmuch-read-qeury. The default value is available via a down-arrow as opposed to history which is available from the up arrow. Note if a user presses return in the minibuffer this value is not returned. The implementation is simple but notmuch-read-query could be called via notmuch-search/notmuch-tree etc from any buffer so it makes sense to put the decision of how to extract the current query in notmuch-read-query rather than in each of the callers.
Diffstat (limited to 'emacs/notmuch.el')
-rw-r--r--emacs/notmuch.el10
1 files changed, 9 insertions, 1 deletions
diff --git a/emacs/notmuch.el b/emacs/notmuch.el
index 2a9876fd..b44a907a 100644
--- a/emacs/notmuch.el
+++ b/emacs/notmuch.el
@@ -863,6 +863,10 @@ PROMPT is the string to prompt with."
(concat "tag:" (notmuch-escape-boolean-term tag)))
(process-lines notmuch-command "search" "--output=tags" "*")))))
(let ((keymap (copy-keymap minibuffer-local-map))
+ (current-query (case major-mode
+ (notmuch-search-mode (notmuch-search-get-query))
+ (notmuch-show-mode (notmuch-show-get-query))
+ (notmuch-tree-mode (notmuch-tree-get-query))))
(minibuffer-completion-table
(completion-table-dynamic
(lambda (string)
@@ -880,7 +884,11 @@ PROMPT is the string to prompt with."
(define-key keymap (kbd "TAB") 'minibuffer-complete)
(let ((history-delete-duplicates t))
(read-from-minibuffer prompt nil keymap nil
- 'notmuch-search-history nil nil)))))
+ 'notmuch-search-history current-query nil)))))
+
+(defun notmuch-search-get-query ()
+ "Return the current query in this search buffer"
+ notmuch-search-query-string)
;;;###autoload
(put 'notmuch-search 'notmuch-doc "Search for messages.")