X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=notmuch.el;h=7fe5e9783cc0fdab735c6ea5f102a5b1068961e3;hb=8debf74e82c16890a033ea9008a993da0db1b99a;hp=54f4a5812e997a2db270164af380f8127c5bc955;hpb=07b2ef26de452e6ef9f98747e36077c2620d3bce;p=notmuch

diff --git a/notmuch.el b/notmuch.el
index 54f4a581..7fe5e978 100644
--- a/notmuch.el
+++ b/notmuch.el
@@ -33,12 +33,37 @@
 
 (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))
+
+(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))
+      (progn
+	(goto-char (point-min))
+	(beginning-of-line))))
+
 ;;;###autoload
 (defun notmuch-show-mode ()
   "Major mode for handling the output of \"notmuch show\""