notmuch.el: Hide email headers by default.

[notmuch] / notmuch.el

diff --git a/notmuch.el b/notmuch.el
index 4e350a80021f90affd362fc7c07a951bfb42b494..e98a30850fdb95fc35a33e0e51ccd1050e37993b 100644 (file)
--- a/notmuch.el
+++ b/notmuch.el
@@ -33,17 +33,89 @@
 
 (defvar notmuch-show-mode-map
   (let ((map (make-sparse-keymap)))
+    (define-key map "h" 'notmuch-show-toggle-headers-visible)
+    (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{")
+(defvar notmuch-show-message-end-regexp   "\fmessage}")
+(defvar notmuch-show-header-begin-regexp  "\fheader{")
+(defvar notmuch-show-header-end-regexp    "\fheader}")
+
+(defvar notmuch-show-headers-visible t)
+
+(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))
+
+(defun notmuch-show-markup-this-header ()
+  (if (re-search-forward notmuch-show-header-begin-regexp nil t)
+      (progn
+       (overlay-put (make-overlay (match-beginning 0) (+ (match-end 0) 1))
+                    'invisible 'notmuch-show-marker)
+       (next-line 1)
+       (beginning-of-line)
+       (let ((beg (point)))
+         (if (re-search-forward notmuch-show-header-end-regexp nil t)
+             (progn
+               (overlay-put (make-overlay beg (match-beginning 0))
+                            'invisible 'notmuch-show-header)
+               (overlay-put (make-overlay (match-beginning 0) (+ (match-end 0) 1))
+                            'invisible 'notmuch-show-marker)))))
+    (goto-char (point-max))))
+
+(defun notmuch-show-markup-headers ()
+  (save-excursion
+    (goto-char (point-min))
+    (while (not (eobp))
+      (notmuch-show-markup-this-header))))
+
+(defun notmuch-show-toggle-headers-visible ()
+  "Toggle visibility of header fields"
+  (interactive)
+  (if notmuch-show-headers-visible
+      (progn
+       (add-to-invisibility-spec 'notmuch-show-header)
+       (set 'notmuch-show-headers-visible nil)
+       ; Need to force the redisplay for some reason
+       (force-window-update)
+       (redisplay t))
+    (remove-from-invisibility-spec 'notmuch-show-header)
+    (set 'notmuch-show-headers-visible t)
+    (force-window-update)
+    (redisplay t)))
+
 ;;;###autoload
 (defun notmuch-show-mode ()
   "Major mode for handling the output of \"notmuch show\""
   (interactive)
   (kill-all-local-variables)
+  (set (make-local-variable 'notmuch-show-headers-visible) t)
+  (notmuch-show-toggle-headers-visible)
+  (add-to-invisibility-spec 'notmuch-show-marker)
   (use-local-map notmuch-show-mode-map)
   (setq major-mode 'notmuch-show-mode
        mode-name "notmuch-show")
@@ -61,9 +133,10 @@
          (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)
+       (notmuch-show-markup-headers)
        )
       )))
 
@@ -79,10 +152,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 +192,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 +271,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.