X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch.el;h=9c3c1e065c870bf9f9fe24c5139d08183c775861;hp=d0c7f3208147383cc0d3781d8edf8f8a58f277ca;hb=40382ed98cc0a801c5ecdde26088d4341e02bcde;hpb=ab2d904e060c6dada013f8bd731fbb4ff824b040

diff --git a/notmuch.el b/notmuch.el
index d0c7f320..9c3c1e06 100644
--- a/notmuch.el
+++ b/notmuch.el
@@ -33,11 +33,38 @@
 
 (defvar notmuch-show-mode-map
   (let ((map (make-sparse-keymap)))
+    (define-key map "n" 'notmuch-show-next-message)
+    (define-key map "p" 'notmuch-show-previous-message)
+    (define-key map "q" 'kill-this-buffer)
     (define-key map "x" 'kill-this-buffer)
     map)
   "Keymap for \"notmuch show\" buffers.")
 (fset 'notmuch-show-mode-map notmuch-show-mode-map)
 
+(defvar notmuch-show-message-begin-regexp "%message{")
+
+(defun notmuch-show-next-message ()
+  "Advance point to the beginning of the next message in the buffer."
+  (interactive)
+  ; First, ensure we get off the current message marker
+  (if (not (eobp))
+      (forward-char))
+  (if (not (re-search-forward notmuch-show-message-begin-regexp nil t))
+      (goto-char (point-max)))
+  (beginning-of-line)
+  (recenter 0))
+
+(defun notmuch-show-previous-message ()
+  "Advance point to the beginning of the previous message in the buffer."
+  (interactive)
+  ; First, ensure we get off the current message marker
+  (if (not (eobp))
+      (forward-char))
+  (if (not (re-search-backward notmuch-show-message-begin-regexp nil t))
+      (goto-char (point-min)))
+  (beginning-of-line)
+  (recenter 0))
+
 ;;;###autoload
 (defun notmuch-show-mode ()
   "Major mode for handling the output of \"notmuch show\""
@@ -60,7 +87,7 @@
 	  (error "notmuch search process already running for query `%s'" query)
 	)
       (erase-buffer)
-      (beginning-of-buffer)
+      (goto-char (point-min))
       (save-excursion
 	(call-process "notmuch" nil t nil "show" thread-id)
 	)
@@ -69,20 +96,34 @@
 (defvar notmuch-search-mode-map
   (let ((map (make-sparse-keymap)))
     (define-key map "a" 'notmuch-search-archive-thread)
+    (define-key map "f" 'notmuch-search-filter)
     (define-key map "n" 'next-line)
     (define-key map "p" 'previous-line)
+    (define-key map "q" 'kill-this-buffer)
+    (define-key map "s" 'notmuch-search)
+    (define-key map "x" 'kill-this-buffer)
     (define-key map "\r" 'notmuch-search-show-thread)
     (define-key map "+" 'notmuch-search-add-tag)
     (define-key map "-" 'notmuch-search-remove-tag)
+    (define-key map "<" 'beginning-of-buffer)
+    (define-key map ">" 'notmuch-search-goto-last-thread)
+    (define-key map "\M->" 'notmuch-search-goto-last-thread)
     map)
   "Keymap for \"notmuch search\" buffers.")
 (fset 'notmuch-search-mode-map notmuch-search-mode-map)
 
+(defun notmuch-search-goto-last-thread (&optional arg)
+  "Move point to the last thread in the buffer."
+  (interactive "^P")
+  (end-of-buffer arg)
+  (beginning-of-line))
+
 ;;;###autoload
 (defun notmuch-search-mode ()
   "Major mode for handling the output of \"notmuch search\""
   (interactive)
   (kill-all-local-variables)
+  (make-local-variable 'notmuch-search-query-string)
   (use-local-map notmuch-search-mode-map)
   (setq major-mode 'notmuch-search-mode
 	mode-name "notmuch-search")
@@ -104,7 +145,7 @@
 
 (defun notmuch-search-markup-thread-ids ()
   (save-excursion
-    (beginning-of-buffer)
+    (goto-char (point-min))
     (while (not (eobp))
       (notmuch-search-markup-this-thread-id)
       (next-line))))
@@ -176,18 +217,33 @@
   (let ((buffer (get-buffer-create (concat "*notmuch-search-" query "*"))))
     (switch-to-buffer buffer)
     (notmuch-search-mode)
+    (set 'notmuch-search-query-string query)
     (let ((proc (get-buffer-process (current-buffer)))
 	  (inhibit-read-only t))
       (if proc
 	  (error "notmuch search process already running for query `%s'" query)
 	)
       (erase-buffer)
-      (beginning-of-buffer)
+      (goto-char (point-min))
       (save-excursion
 	(call-process "notmuch" nil t nil "search" query)
-	)
-      (notmuch-search-markup-thread-ids)
-      )))
+	(notmuch-search-markup-thread-ids)
+        ; A well-behaved program ends its output with a newline, but we
+        ; don't actually want the blank line at the end of the file.
+	(goto-char (point-max))
+	(if (looking-at "^$")
+	    (delete-backward-char 1)
+	  )
+	))))
+
+(defun notmuch-search-filter (query)
+  "Run \"notmuch search\" to refine the current search results.
+
+A search string will be constructed by appending QUERY to the
+current search string, and the results of \"notmuch search\" for
+the combined query will be displayed."
+  (interactive "sFilter search: ")
+  (notmuch-search (concat notmuch-search-query-string " and " query)))
 
 (defun notmuch ()
   "Run notmuch to display all mail with tag of 'inbox'"