From: Mark Walters <markwalters1009@gmail.com>
To: notmuch@notmuchmail.org
Subject: [PATCH] contrib: pick: close message pane when quitting from show in the message pane
Date: Tue, 25 Dec 2012 11:47:17 +0000 [thread overview]
Message-ID: <1356436037-15597-1-git-send-email-markwalters1009@gmail.com> (raw)
In-Reply-To: <1355650241-27196-1-git-send-email-markwalters1009@gmail.com>
We add a hook to the show buffer in the message window to close the
message window when that buffer quits. It checks that the
message-window is still displaying the show-message buffer and then
closes it.
---
This is just a slightly tidier version of the previous patch. It is
more natural to reuse the nomuch-pick-message-window variable (as it
serves the same pupose) rather than adding a new variable and
cluttering up the name space (and it also keeps the clutter in the
notmuch-pick namespace).
I think this a good candidate for 0.15: it fixes an annoying bug in pick.
Best wishes
Mark
contrib/notmuch-pick/notmuch-pick.el | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/contrib/notmuch-pick/notmuch-pick.el b/contrib/notmuch-pick/notmuch-pick.el
index 1a553d4..7d01f4c 100644
--- a/contrib/notmuch-pick/notmuch-pick.el
+++ b/contrib/notmuch-pick/notmuch-pick.el
@@ -157,6 +157,10 @@
(make-variable-buffer-local 'notmuch-pick-query-context)
(defvar notmuch-pick-buffer-name nil)
(make-variable-buffer-local 'notmuch-pick-buffer-name)
+;; This variable is the window used for the message pane. It is set
+;; in both the parent pick buffer and the child show buffer. It is
+;; used to try and close the message pane when quitting pick or the
+;; child show buffer.
(defvar notmuch-pick-message-window nil)
(make-variable-buffer-local 'notmuch-pick-message-window)
(put 'notmuch-pick-message-window 'permanent-local t)
@@ -324,6 +328,16 @@ Does NOT change the database."
(notmuch-prettify-subject (notmuch-search-find-subject)))
(notmuch-pick-show-match-message-with-wait))
+(defun notmuch-pick-message-window-kill-hook ()
+ (let ((buffer (current-buffer)))
+ (when (and (window-live-p notmuch-pick-message-window)
+ (eq (window-buffer notmuch-pick-message-window) buffer))
+ ;; We do not want an error if this is the sole window in the
+ ;; frame and I do not know how to test for that in emacs pre
+ ;; 24. Hence we just ignore-errors.
+ (ignore-errors
+ (delete-window notmuch-pick-message-window)))))
+
(defun notmuch-pick-show-message ()
"Show the current message (in split-pane)."
(interactive)
@@ -341,6 +355,11 @@ Does NOT change the database."
(let ((notmuch-show-indent-messages-width 0))
(setq current-prefix-arg '(4))
(setq buffer (notmuch-show id nil nil nil))))
+ ;; We need the `let' as notmuch-pick-message-window is buffer local.
+ (let ((window notmuch-pick-message-window))
+ (with-current-buffer buffer
+ (setq notmuch-pick-message-window window)
+ (add-hook 'kill-buffer-hook 'notmuch-pick-message-window-kill-hook)))
(notmuch-pick-tag-update-display (list "-unread"))
(setq notmuch-pick-message-buffer buffer))))
--
1.7.9.1
next prev parent reply other threads:[~2012-12-25 11:47 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-13 9:31 [PATCH (draft)] contrib: pick: close message pane when quitting from show in the message pane Mark Walters
2012-12-16 9:30 ` [PATCH] " Mark Walters
2012-12-25 11:47 ` Mark Walters [this message]
2012-12-25 12:21 ` Tomi Ollila
2012-12-26 3:08 ` David Bremner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1356436037-15597-1-git-send-email-markwalters1009@gmail.com \
--to=markwalters1009@gmail.com \
--cc=notmuch@notmuchmail.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).