notmuch show: Switch to control character to mark sections of output

[notmuch] / notmuch.el

diff --git a/notmuch.el b/notmuch.el
index 4e350a80021f90affd362fc7c07a951bfb42b494..00a03c0ed7c1ea979f417ecc8a346b0a064bd2ef 100644 (file)
--- a/notmuch.el
+++ b/notmuch.el
@@ -33,12 +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 "\fmessage{")
+
+(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\""
@@ -61,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)
        )
@@ -79,10 +105,19 @@
     (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\""
@@ -110,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))))
@@ -189,12 +224,17 @@
          (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.