[PATCH 1/2] emacs: add show view bindings to move to previous/next thread
Mark Walters
markwalters1009 at gmail.com
Sat May 25 06:39:58 PDT 2013
Hi
> We have most of the plumbing in place, add the bindings M-n and M-p.
>
> ---
>
> v2: reduce duplication by adding PREVIOUS argument to
> notmuch-show-next-thread instead of adding a separate function for
> moving to previous thread (Mark)
> ---
> emacs/notmuch-show.el | 28 ++++++++++++++++++++++++----
> 1 file changed, 24 insertions(+), 4 deletions(-)
>
> diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el
> index d56154e..a903395 100644
> --- a/emacs/notmuch-show.el
> +++ b/emacs/notmuch-show.el
> @@ -39,6 +39,7 @@
>
> (declare-function notmuch-call-notmuch-process "notmuch" (&rest args))
> (declare-function notmuch-search-next-thread "notmuch" nil)
> +(declare-function notmuch-search-previous-thread "notmuch" nil)
> (declare-function notmuch-search-show-thread "notmuch" nil)
>
> (defcustom notmuch-message-headers '("Subject" "To" "Cc" "Date")
> @@ -1273,6 +1274,8 @@ reset based on the original query."
> (define-key map "P" 'notmuch-show-previous-message)
> (define-key map "n" 'notmuch-show-next-open-message)
> (define-key map "p" 'notmuch-show-previous-open-message)
> + (define-key map (kbd "M-n") 'notmuch-show-next-thread-show)
> + (define-key map (kbd "M-p") 'notmuch-show-previous-thread-show)
> (define-key map (kbd "DEL") 'notmuch-show-rewind)
> (define-key map " " 'notmuch-show-advance-and-archive)
> (define-key map (kbd "M-RET") 'notmuch-show-open-or-close-all)
> @@ -1834,17 +1837,34 @@ argument, hide all of the messages."
> (interactive)
> (backward-button 1))
>
> -(defun notmuch-show-next-thread (&optional show-next)
> - "Move to the next item in the search results, if any."
> +(defun notmuch-show-next-thread (&optional show previous)
> + "Move to the next item in the search results, if any.
> +
> +If SHOW is non-nil, open the next item in a show
> +buffer. Otherwise just highlight the next item in the search
> +buffer. If PREVIOUS is non-nil, move to the previous item in the
> +search results instead."
> (interactive "P")
> (let ((parent-buffer notmuch-show-parent-buffer))
> (notmuch-kill-this-buffer)
> (when (buffer-live-p parent-buffer)
> (switch-to-buffer parent-buffer)
> - (notmuch-search-next-thread)
> - (if show-next
> + (if previous
> + (notmuch-search-previous-thread)
> + (notmuch-search-next-thread))
> + (if show
> (notmuch-search-show-thread)))))
Did you want this to not exit back to the search results if you do M-p
on the first result? I attach a version below that does exit back (so
M-p and M-n behave the same.
Best wishes
Mark
>From 22f03457a4c1884d35cf3de32f55977b980b7960 Mon Sep 17 00:00:00 2001
From: Jani Nikula <jani at nikula.org>
Date: Sat, 25 May 2013 15:14:25 +0300
Subject: [PATCH 1/2] emacs: add show view bindings to move to previous/next
thread
We have most of the plumbing in place, add the bindings M-n and M-p.
---
emacs/notmuch-show.el | 30 +++++++++++++++++++++++++-----
1 files changed, 25 insertions(+), 5 deletions(-)
diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el
index d56154e..2b33007 100644
--- a/emacs/notmuch-show.el
+++ b/emacs/notmuch-show.el
@@ -39,6 +39,7 @@
(declare-function notmuch-call-notmuch-process "notmuch" (&rest args))
(declare-function notmuch-search-next-thread "notmuch" nil)
+(declare-function notmuch-search-previous-thread "notmuch" nil)
(declare-function notmuch-search-show-thread "notmuch" nil)
(defcustom notmuch-message-headers '("Subject" "To" "Cc" "Date")
@@ -1273,6 +1274,8 @@ reset based on the original query."
(define-key map "P" 'notmuch-show-previous-message)
(define-key map "n" 'notmuch-show-next-open-message)
(define-key map "p" 'notmuch-show-previous-open-message)
+ (define-key map (kbd "M-n") 'notmuch-show-next-thread-show)
+ (define-key map (kbd "M-p") 'notmuch-show-previous-thread-show)
(define-key map (kbd "DEL") 'notmuch-show-rewind)
(define-key map " " 'notmuch-show-advance-and-archive)
(define-key map (kbd "M-RET") 'notmuch-show-open-or-close-all)
@@ -1834,16 +1837,33 @@ argument, hide all of the messages."
(interactive)
(backward-button 1))
-(defun notmuch-show-next-thread (&optional show-next)
- "Move to the next item in the search results, if any."
+(defun notmuch-show-next-thread (&optional show previous)
+ "Move to the next item in the search results, if any.
+
+If SHOW is non-nil, open the next item in a show
+buffer. Otherwise just highlight the next item in the search
+buffer. If PREVIOUS is non-nil, move to the previous item in the
+search results instead."
(interactive "P")
(let ((parent-buffer notmuch-show-parent-buffer))
(notmuch-kill-this-buffer)
(when (buffer-live-p parent-buffer)
(switch-to-buffer parent-buffer)
- (notmuch-search-next-thread)
- (if show-next
- (notmuch-search-show-thread)))))
+ (and (if previous
+ (notmuch-search-previous-thread)
+ (notmuch-search-next-thread))
+ show
+ (notmuch-search-show-thread)))))
+
+(defun notmuch-show-next-thread-show ()
+ "Show the next thread in the search results, if any."
+ (interactive)
+ (notmuch-show-next-thread t))
+
+(defun notmuch-show-previous-thread-show ()
+ "Show the previous thread in the search results, if any."
+ (interactive)
+ (notmuch-show-next-thread t t))
(defun notmuch-show-archive-thread (&optional unarchive)
"Archive each message in thread.
--
1.7.9.1
More information about the notmuch
mailing list