Merge branch 'release'

Merge bugfixes applied directly to release

diff --combined emacs/notmuch-lib.el
index 1c3a9fe1865f13048c23dbc1b00b702cf15f1081,dedcbeb865562903a2595e0a5883ef0e01a2d8c4..89c01a578ccdfe331599f21fc3174d1e15807923
--- 1/emacs/notmuch-lib.el
--- 2/emacs/notmuch-lib.el
+++ b/emacs/notmuch-lib.el
@@@ -232,9 -232,6 +232,9 @@@ on the command line, and then retry you
    "Return the user.other_email value (as a list) from the notmuch configuration."
    (split-string (notmuch-config-get "user.other_email") "\n" t))
  
 +(defun notmuch-user-emails ()
 +  (cons (notmuch-user-primary-email) (notmuch-user-other-email)))
 +
  (defun notmuch-poll ()
    "Run \"notmuch new\" or an external script to import mail.
  
@@@ -243,8 -240,9 +243,9 @@@ depending on the value of `notmuch-poll
    (interactive)
    (if (stringp notmuch-poll-script)
        (unless (string= notmuch-poll-script "")
-       (call-process notmuch-poll-script nil nil))
-     (call-process notmuch-command nil nil nil "new")))
+       (unless (equal (call-process notmuch-poll-script nil nil) 0)
+         (error "Notmuch: poll script `%s' failed!" notmuch-poll-script)))
+     (notmuch-call-notmuch-process "new")))
  
  (defun notmuch-bury-or-kill-this-buffer ()
    "Undisplay the current buffer.