From: Jameson Rollins <jrollins@finestructure.net>
To: Notmuch Mail <notmuch@notmuchmail.org>
Subject: [PATCH 1/2] Don't use kill-this-buffer to kill notmuch emacs buffers
Date: Sat, 6 Nov 2010 16:49:28 -0400 [thread overview]
Message-ID: <87y696yw37.fsf@servo.finestructure.net> (raw)
kill-this-buffer appears to be a function intended specifically for
use in the menu bar, and causes problem killing notmuch buffers when
multiple frames have been used. This patch replaces kill-this-buffer
with notmuch-kill-this-buffer, which in turn just simply calls
(kill-buffer (current-buffer)).
---
emacs/notmuch-hello.el | 2 +-
emacs/notmuch-lib.el | 5 +++++
emacs/notmuch-show.el | 4 ++--
emacs/notmuch.el | 4 ++--
4 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/emacs/notmuch-hello.el b/emacs/notmuch-hello.el
index 4b6a90d..e58dd24 100644
--- a/emacs/notmuch-hello.el
+++ b/emacs/notmuch-hello.el
@@ -294,7 +294,7 @@ should be. Returns a cons cell `(tags-per-line width)'."
(define-key map "v" '(lambda () "Display the notmuch version" (interactive)
(message "notmuch version %s" (notmuch-version))))
(define-key map "?" 'notmuch-help)
- (define-key map "q" 'kill-this-buffer)
+ (define-key map "q" 'notmuch-kill-this-buffer)
(define-key map "=" 'notmuch-hello-update)
(define-key map "G" 'notmuch-hello-poll-and-update)
(define-key map (kbd "<C-tab>") 'widget-backward)
diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el
index abcbfa1..dfdcd05 100644
--- a/emacs/notmuch-lib.el
+++ b/emacs/notmuch-lib.el
@@ -87,6 +87,11 @@ the user hasn't set this variable with the old or new value."
"Return the user.primary_email value from the notmuch configuration."
(notmuch-config-get "user.primary_email"))
+(defun notmuch-kill-this-buffer ()
+ "Kill the current buffer."
+ (interactive)
+ (kill-buffer (current-buffer)))
+
;;
;; XXX: This should be a generic function in emacs somewhere, not
diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el
index 7ec6aa5..6b2268f 100644
--- a/emacs/notmuch-show.el
+++ b/emacs/notmuch-show.el
@@ -555,7 +555,7 @@ function is used. "
(defvar notmuch-show-mode-map
(let ((map (make-sparse-keymap)))
(define-key map "?" 'notmuch-help)
- (define-key map "q" 'kill-this-buffer)
+ (define-key map "q" 'notmuch-kill-this-buffer)
(define-key map (kbd "<C-tab>") 'widget-backward)
(define-key map (kbd "M-TAB") 'notmuch-show-previous-button)
(define-key map (kbd "<backtab>") 'notmuch-show-previous-button)
@@ -1038,7 +1038,7 @@ argument, hide all of the messages."
until (not (notmuch-show-goto-message-next)))
;; Move to the next item in the search results, if any.
(let ((parent-buffer notmuch-show-parent-buffer))
- (kill-this-buffer)
+ (notmuch-kill-this-buffer)
(if parent-buffer
(progn
(switch-to-buffer parent-buffer)
diff --git a/emacs/notmuch.el b/emacs/notmuch.el
index 2a87ab9..4a9223e 100644
--- a/emacs/notmuch.el
+++ b/emacs/notmuch.el
@@ -232,7 +232,7 @@ For a mouse binding, return nil."
"Exit the search buffer, calling any defined continuation function."
(interactive)
(let ((continuation notmuch-search-continuation))
- (kill-this-buffer)
+ (notmuch-kill-this-buffer)
(when continuation
(funcall continuation))))
@@ -824,7 +824,7 @@ same relative position within the new buffer."
(target-thread (notmuch-search-find-thread-id))
(query notmuch-search-query-string)
(continuation notmuch-search-continuation))
- (kill-this-buffer)
+ (notmuch-kill-this-buffer)
(notmuch-search query oldest-first target-thread target-line continuation)
(goto-char (point-min))))
--
1.7.2.3
next reply other threads:[~2010-11-06 21:35 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-06 20:49 Jameson Rollins [this message]
2010-11-08 17:09 ` [PATCH 1/2] Don't use kill-this-buffer to kill notmuch emacs buffers Carl Worth
2010-11-08 18:56 ` Jameson Rollins
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=87y696yw37.fsf@servo.finestructure.net \
--to=jrollins@finestructure.net \
--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).