CLisp'ier version of `notmuch-cycle-notmuch-buffers', merged into `notmuch', eliminating the need to hog yet another keybind. FYI: causes 2 compile warnings due to requiring the cl package at runtime. --- emacs/notmuch.el | 34 ++++++++-------------------------- 1 files changed, 8 insertions(+), 26 deletions(-) diff --git a/emacs/notmuch.el b/emacs/notmuch.el index ef4dcc7..60ab0b2 100644 --- a/emacs/notmuch.el +++ b/emacs/notmuch.el @@ -1067,7 +1067,14 @@ current search results AND that are tagged with the given tag." (defun notmuch () "Run notmuch and display saved searches, known tags, etc." (interactive) - (notmuch-hello)) + (let* ((old-buffer (current-buffer)) + (interesting-buffers (remove-if-not #'notmuch-interesting-buffer (buffer-list))) + (next-buffer (first (member-if-not #'(lambda (b) (eq old-buffer b)) interesting-buffers)))) + (if next-buffer + (progn + (switch-to-buffer next-buffer) + (bury-buffer old-buffer)) + (notmuch-hello)))) (defun notmuch-interesting-buffer (b) "Is the current buffer of interest to a notmuch user?" @@ -1078,31 +1085,6 @@ current search results AND that are tagged with the given tag." message-mode)))) ;;;###autoload -(defun notmuch-cycle-notmuch-buffers () - "Cycle through any existing notmuch buffers (search, show or hello). - -If the current buffer is the only notmuch buffer, bury it. If no -notmuch buffers exist, run `notmuch'." - (interactive) - - (let (start first) - ;; If the current buffer is a notmuch buffer, remember it and then - ;; bury it. - (when (notmuch-interesting-buffer (current-buffer)) - (setq start (current-buffer)) - (bury-buffer)) - - ;; Find the first notmuch buffer. - (setq first (loop for buffer in (buffer-list) - if (notmuch-interesting-buffer buffer) - return buffer)) - - (if first - ;; If the first one we found is any other than the starting - ;; buffer, switch to it. - (unless (eq first start) - (switch-to-buffer first)) - (notmuch)))) (setq mail-user-agent 'notmuch-user-agent) -- 1.7.8.1