debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-22 10:58:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't use kill-this-buffer to kill notmuch emacs buffers

Browse source 
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)).
This commit is contained in:
Jameson Rollins 2010-11-06 16:49:28 -04:00 committed by Carl Worth
parent c7189ed607
commit 7171e77d4d
4 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
emacs/notmuch-hello.el
View file

@ -294,7 +294,7 @@ should be. Returns a cons cell `(tags-per-line width)'."
(define-key map "v" '(lambda () "Display the notmuch version" (interactive) (define-key map "v" '(lambda () "Display the notmuch version" (interactive)
(message "notmuch version %s" (notmuch-version)))) (message "notmuch version %s" (notmuch-version))))
(define-key map "?" 'notmuch-help) (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 "=" 'notmuch-hello-update)
(define-key map "G" 'notmuch-hello-poll-and-update) (define-key map "G" 'notmuch-hello-poll-and-update)
(define-key map (kbd "<C-tab>") 'widget-backward) (define-key map (kbd "<C-tab>") 'widget-backward)

5
emacs/notmuch-lib.el
View file

@ -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." "Return the user.primary_email value from the notmuch configuration."
(notmuch-config-get "user.primary_email")) (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 ;; XXX: This should be a generic function in emacs somewhere, not

4
emacs/notmuch-show.el
View file

@ -555,7 +555,7 @@ function is used. "
(defvar notmuch-show-mode-map (defvar notmuch-show-mode-map
(let ((map (make-sparse-keymap))) (let ((map (make-sparse-keymap)))
(define-key map "?" 'notmuch-help) (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 "<C-tab>") 'widget-backward)
(define-key map (kbd "M-TAB") 'notmuch-show-previous-button) (define-key map (kbd "M-TAB") 'notmuch-show-previous-button)
(define-key map (kbd "<backtab>") 'notmuch-show-previous-button) (define-key map (kbd "<backtab>") 'notmuch-show-previous-button)
@ -1043,7 +1043,7 @@ argument, hide all of the messages."
until (not (notmuch-show-goto-message-next))) until (not (notmuch-show-goto-message-next)))
;; Move to the next item in the search results, if any. ;; Move to the next item in the search results, if any.
(let ((parent-buffer notmuch-show-parent-buffer)) (let ((parent-buffer notmuch-show-parent-buffer))
(kill-this-buffer) (notmuch-kill-this-buffer)
(if parent-buffer (if parent-buffer
(progn (progn
(switch-to-buffer parent-buffer) (switch-to-buffer parent-buffer)

4
emacs/notmuch.el
View file

@ -232,7 +232,7 @@ For a mouse binding, return nil."
"Exit the search buffer, calling any defined continuation function." "Exit the search buffer, calling any defined continuation function."
(interactive) (interactive)
(let ((continuation notmuch-search-continuation)) (let ((continuation notmuch-search-continuation))
(kill-this-buffer) (notmuch-kill-this-buffer)
(when continuation (when continuation
(funcall continuation)))) (funcall continuation))))
@ -824,7 +824,7 @@ same relative position within the new buffer."
(target-thread (notmuch-search-find-thread-id)) (target-thread (notmuch-search-find-thread-id))
(query notmuch-search-query-string) (query notmuch-search-query-string)
(continuation notmuch-search-continuation)) (continuation notmuch-search-continuation))
(kill-this-buffer) (notmuch-kill-this-buffer)
(notmuch-search query oldest-first target-thread target-line continuation) (notmuch-search query oldest-first target-thread target-line continuation)
(goto-char (point-min)))) (goto-char (point-min))))