notmuch.el: Add bindings for scrolling to notmuch-search mode.

[notmuch] / notmuch.el

diff --git a/notmuch.el b/notmuch.el
index 513b7d9163e3b87e484035b97653b2803dae629c..18aca1c7cc9fa20f1bd049a83a9b46cf9a4f37c3 100644 (file)
--- a/notmuch.el
+++ b/notmuch.el
@@ -18,18 +18,6 @@
 ; along with Notmuch.  If not, see <http://www.gnu.org/licenses/>.
 ;
 ; Authors: Carl Worth <cworth@cworth.org>
-;
-; Much of notmuch.el was written by looking at the implementation of
-; compile.el from the emacs distribution source which has the
-; following copyright and authorsip (and the identical license as
-; above):
-;
-; Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-;   2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-;   Free Software Foundation, Inc.
-
-; Authors: Roland McGrath <roland@gnu.org>,
-;          Daniel Pfeiffer <occitan@esperanto.org>
 
 (defvar notmuch-show-mode-map
   (let ((map (make-sparse-keymap)))
@@ -40,10 +28,11 @@
     ; Will be much preferable to switch to direct manipulation for
     ; toggling visibility of these components. Probably using
     ; overlays-at to query and manipulate the current overlay.
+    (define-key map "a" 'notmuch-show-archive-thread)
     (define-key map "b" 'notmuch-show-toggle-body-read-visible)
     (define-key map "c" 'notmuch-show-toggle-citations-visible)
     (define-key map "h" 'notmuch-show-toggle-headers-visible)
-    (define-key map "n" 'notmuch-show-next-message)
+    (define-key map "n" 'notmuch-show-mark-read-then-next-message)
     (define-key map "p" 'notmuch-show-previous-message)
     (define-key map "q" 'kill-this-buffer)
     (define-key map "s" 'notmuch-show-toggle-signatures-visible)
@@ -108,13 +97,28 @@
   (notmuch-call-notmuch-process "tag" (concat "-" tag) (concat "id:" (notmuch-show-get-message-id)))
   (notmuch-show-set-tags (delete tag (notmuch-show-get-tags))))
 
+(defun notmuch-show-archive-thread ()
+  "Archive each message currrently shown by removing the \"inbox\" tag from each.
+
+This command is safe from any race condition of new messages
+being delivered to the same thread. It does not archive the
+entire thread, but only the messages shown in the current
+buffer."
+  (interactive)
+  (save-excursion
+    (goto-char (point-min))
+    (while (not (eobp))
+      (notmuch-show-remove-tag "inbox")
+      (if (not (eobp))
+         (forward-char))
+      (if (not (re-search-forward notmuch-show-message-begin-regexp nil t))
+         (goto-char (point-max))))))
+
 (defun notmuch-show-next-message ()
   "Advance point to the beginning of the next message in the buffer.
 
-Before moving, also remove the \"unread\" tag from the current message."
+Does nothing if already on the last message."
   (interactive)
-  (if (member "unread" (notmuch-show-get-tags))
-      (notmuch-show-remove-tag "unread"))
   ; First, ensure we get off the current message marker
   (if (not (eobp))
       (forward-char))
@@ -135,7 +139,9 @@ Before moving, also remove the \"unread\" tag from the current message."
   (recenter 0))
 
 (defun notmuch-show-previous-message ()
-  "Advance point to the beginning of the previous message in the buffer."
+  "Backup to the beginning of the previous message in the buffer.
+
+Does nothing if already on the first message in the buffer."
   (interactive)
   ; First, ensure we get off the current message marker
   (if (not (bobp))
@@ -156,6 +162,13 @@ Before moving, also remove the \"unread\" tag from the current message."
   (beginning-of-line)
   (recenter 0))
 
+(defun notmuch-show-mark-read-then-next-message ()
+  "Remove uread tag from current message, then advance to next message."
+  (interactive)
+  (if (member "unread" (notmuch-show-get-tags))
+      (notmuch-show-remove-tag "unread"))
+  (notmuch-show-next-message))
+
 (defun notmuch-show-markup-citations-region (beg end)
   (goto-char beg)
   (beginning-of-line)
@@ -309,6 +322,7 @@ Before moving, also remove the \"unread\" tag from the current message."
 (defvar notmuch-search-mode-map
   (let ((map (make-sparse-keymap)))
     (define-key map "a" 'notmuch-search-archive-thread)
+    (define-key map "b" 'scroll-down)
     (define-key map "f" 'notmuch-search-filter)
     (define-key map "n" 'next-line)
     (define-key map "p" 'previous-line)
@@ -322,6 +336,8 @@ Before moving, also remove the \"unread\" tag from the current message."
     (define-key map ">" 'notmuch-search-goto-last-thread)
     (define-key map "=" 'notmuch-search-refresh-view)
     (define-key map "\M->" 'notmuch-search-goto-last-thread)
+    (define-key map " " 'scroll-up)
+    (define-key map (kbd "<DEL>") 'scroll-down)
     map)
   "Keymap for \"notmuch search\" buffers.")
 (fset 'notmuch-search-mode-map notmuch-search-mode-map)
@@ -338,6 +354,8 @@ Before moving, also remove the \"unread\" tag from the current message."
   (interactive)
   (kill-all-local-variables)
   (make-local-variable 'notmuch-search-query-string)
+  (set (make-local-variable 'scroll-preserve-screen-position) t)
+  (add-to-invisibility-spec 'notmuch-search)
   (use-local-map notmuch-search-mode-map)
   (setq major-mode 'notmuch-search-mode
        mode-name "notmuch-search")
@@ -366,11 +384,15 @@ Before moving, also remove the \"unread\" tag from the current message."
 
 (defun notmuch-search-hide-thread-ids ()
   (interactive)
-  (add-to-invisibility-spec 'notmuch-search))
+  (add-to-invisibility-spec 'notmuch-search)
+  (force-window-update)
+  (redisplay t))
 
 (defun notmuch-search-show-thread-ids ()
   (interactive)
-  (remove-from-invisibility-spec 'notmuch-search))
+  (remove-from-invisibility-spec 'notmuch-search)
+  (force-window-update)
+  (redisplay t))
 
 (defun notmuch-search-show-thread ()
   (interactive)