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

Merge branch 'release'

Browse source 
Merge bugfixes applied directly to release
This commit is contained in:
David Bremner 2015-11-23 08:40:40 -04:00
commit bceb6516ce
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
emacs/notmuch-hello.el
View file

@ -652,8 +652,12 @@ with `notmuch-hello-query-counts'."
(defvar notmuch-hello-mode-map (defvar notmuch-hello-mode-map
(let ((map (if (fboundp 'make-composed-keymap) (let ((map (if (fboundp 'make-composed-keymap)
;; Inherit both widget-keymap and notmuch-common-keymap ;; Inherit both widget-keymap and
(make-composed-keymap widget-keymap) ;; notmuch-common-keymap. We have to use
;; make-sparse-keymap to force this to be a new
;; keymap (so that when we modify map it does not
;; modify widget-keymap).
(make-composed-keymap (list (make-sparse-keymap) widget-keymap))
;; Before Emacs 24, keymaps didn't support multiple ;; Before Emacs 24, keymaps didn't support multiple
;; inheritance,, so just copy the widget keymap since ;; inheritance,, so just copy the widget keymap since
;; it's unlikely to change. ;; it's unlikely to change.

5
emacs/notmuch-lib.el
View file

@ -243,8 +243,9 @@ depending on the value of `notmuch-poll-script'."
(interactive) (interactive)
(if (stringp notmuch-poll-script) (if (stringp notmuch-poll-script)
(unless (string= notmuch-poll-script "") (unless (string= notmuch-poll-script "")
(call-process notmuch-poll-script nil nil)) (unless (equal (call-process notmuch-poll-script nil nil) 0)
(call-process notmuch-command nil nil nil "new"))) (error "Notmuch: poll script `%s' failed!" notmuch-poll-script)))
(notmuch-call-notmuch-process "new")))
(defun notmuch-bury-or-kill-this-buffer () (defun notmuch-bury-or-kill-this-buffer ()
"Undisplay the current buffer. "Undisplay the current buffer.