X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch.el;h=32c2887bed5410853f5701e6ce4c422b867c2a5f;hp=84152fbccfebb14d55511a50d8fa759873c32d08;hb=8c9cc63a2e21071df83aef22acd0ae362f48e10b;hpb=7e8ba9adf8198acf46f36913853c1af332467afe

diff --git a/notmuch.el b/notmuch.el
index 84152fbc..32c2887b 100644
--- a/notmuch.el
+++ b/notmuch.el
@@ -31,22 +31,45 @@
 ; Authors: Roland McGrath <roland@gnu.org>,
 ;	    Daniel Pfeiffer <occitan@esperanto.org>
 
+(defvar notmuch-search-mode-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map "n" 'next-line)
+    (define-key map "p" 'previous-line)
+    map)
+  "Keymap for \"notmuch search\" buffers.")
+(fset 'notmuch-search-mode-map notmuch-search-mode-map)
+
 ;;;###autoload
 (defun notmuch-search-mode ()
   "Major mode for handling the output of notmuch search"
   (interactive)
   (kill-all-local-variables)
+  (use-local-map notmuch-search-mode-map)
   (setq major-mode 'notmuch-search-mode
 	mode-name "notmuch-search")
   (setq buffer-read-only t))
 
 (defun notmuch-search (query)
   "Run \"notmuch search\" with the given query string and display results."
-  (interactive "sNotmuch search:")
-  (compilation-start (concat "notmuch search " query) 'notmuch-search-mode))
+  (interactive "sNotmuch search: ")
+  (let ((buffer (get-buffer-create (concat "*notmuch-search-" query))))
+    (switch-to-buffer buffer)
+    (notmuch-search-mode)
+    (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)
+      (save-excursion
+	(call-process "notmuch" nil t nil "search" query)
+	)
+      )))
 
 (defun notmuch ()
   "Run notmuch to display all mail with tag of 'inbox'"
   (interactive)
-  (require 'compile)
   (notmuch-search "tag:inbox"))
+
+(provide 'notmuch)