2010-04-01 19:36:21 +02:00
|
|
|
;; notmuch-lib.el --- common variables, functions and function declarations
|
|
|
|
;;
|
|
|
|
;; Copyright © Carl Worth
|
|
|
|
;;
|
|
|
|
;; This file is part of Notmuch.
|
|
|
|
;;
|
|
|
|
;; Notmuch is free software: you can redistribute it and/or modify it
|
|
|
|
;; under the terms of the GNU General Public License as published by
|
|
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
|
|
;; (at your option) any later version.
|
|
|
|
;;
|
|
|
|
;; Notmuch is distributed in the hope that it will be useful, but
|
|
|
|
;; WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
;; General Public License for more details.
|
|
|
|
;;
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
|
|
|
;; along with Notmuch. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
;;
|
|
|
|
;; Authors: Carl Worth <cworth@cworth.org>
|
|
|
|
|
|
|
|
;; This is an part of an emacs-based interface to the notmuch mail system.
|
|
|
|
|
2012-05-05 21:30:37 +02:00
|
|
|
(require 'mm-view)
|
|
|
|
(require 'mm-decode)
|
2012-08-08 23:40:10 +02:00
|
|
|
(require 'cl)
|
2012-03-18 17:32:40 +01:00
|
|
|
|
2010-04-01 19:36:21 +02:00
|
|
|
(defvar notmuch-command "notmuch"
|
|
|
|
"Command to run the notmuch binary.")
|
|
|
|
|
2010-04-22 10:27:33 +02:00
|
|
|
(defgroup notmuch nil
|
|
|
|
"Notmuch mail reader for Emacs."
|
|
|
|
:group 'mail)
|
|
|
|
|
2012-01-16 11:38:33 +01:00
|
|
|
(defgroup notmuch-hello nil
|
|
|
|
"Overview of saved searches, tags, etc."
|
|
|
|
:group 'notmuch)
|
|
|
|
|
|
|
|
(defgroup notmuch-search nil
|
|
|
|
"Searching and sorting mail."
|
|
|
|
:group 'notmuch)
|
|
|
|
|
|
|
|
(defgroup notmuch-show nil
|
|
|
|
"Showing messages and threads."
|
|
|
|
:group 'notmuch)
|
|
|
|
|
|
|
|
(defgroup notmuch-send nil
|
|
|
|
"Sending messages from Notmuch."
|
2012-01-19 20:13:05 +01:00
|
|
|
:group 'notmuch)
|
|
|
|
|
|
|
|
(custom-add-to-group 'notmuch-send 'message 'custom-group)
|
2012-01-16 11:38:33 +01:00
|
|
|
|
|
|
|
(defgroup notmuch-crypto nil
|
|
|
|
"Processing and display of cryptographic MIME parts."
|
|
|
|
:group 'notmuch)
|
|
|
|
|
|
|
|
(defgroup notmuch-hooks nil
|
|
|
|
"Running custom code on well-defined occasions."
|
|
|
|
:group 'notmuch)
|
|
|
|
|
|
|
|
(defgroup notmuch-external nil
|
|
|
|
"Running external commands from within Notmuch."
|
|
|
|
:group 'notmuch)
|
|
|
|
|
|
|
|
(defgroup notmuch-faces nil
|
|
|
|
"Graphical attributes for displaying text"
|
|
|
|
:group 'notmuch)
|
|
|
|
|
2010-04-26 17:07:04 +02:00
|
|
|
(defcustom notmuch-search-oldest-first t
|
2013-06-03 19:56:31 +02:00
|
|
|
"Show the oldest mail first when searching.
|
|
|
|
|
|
|
|
This variable defines the default sort order for displaying
|
|
|
|
search results. Note that any filtered searches created by
|
|
|
|
`notmuch-search-filter' retain the search order of the parent
|
|
|
|
search."
|
2010-04-26 17:07:04 +02:00
|
|
|
:type 'boolean
|
2012-01-16 11:38:33 +01:00
|
|
|
:group 'notmuch-search)
|
2010-04-26 17:07:04 +02:00
|
|
|
|
2010-04-22 11:03:32 +02:00
|
|
|
;;
|
|
|
|
|
2012-01-25 02:10:53 +01:00
|
|
|
(defvar notmuch-search-history nil
|
|
|
|
"Variable to store notmuch searches history.")
|
|
|
|
|
2012-12-03 22:23:44 +01:00
|
|
|
(defcustom notmuch-saved-searches '(("inbox" . "tag:inbox")
|
|
|
|
("unread" . "tag:unread"))
|
2010-04-27 07:37:11 +02:00
|
|
|
"A list of saved searches to display."
|
|
|
|
:type '(alist :key-type string :value-type string)
|
2012-01-16 11:38:33 +01:00
|
|
|
:group 'notmuch-hello)
|
2010-04-27 07:37:11 +02:00
|
|
|
|
2012-09-06 17:32:40 +02:00
|
|
|
(defcustom notmuch-archive-tags '("-inbox")
|
|
|
|
"List of tag changes to apply to a message or a thread when it is archived.
|
|
|
|
|
|
|
|
Tags starting with \"+\" (or not starting with either \"+\" or
|
|
|
|
\"-\") in the list will be added, and tags starting with \"-\"
|
|
|
|
will be removed from the message or thread being archived.
|
|
|
|
|
|
|
|
For example, if you wanted to remove an \"inbox\" tag and add an
|
|
|
|
\"archived\" tag, you would set:
|
|
|
|
(\"-inbox\" \"+archived\")"
|
|
|
|
:type '(repeat string)
|
|
|
|
:group 'notmuch-search
|
|
|
|
:group 'notmuch-show)
|
|
|
|
|
2013-01-07 22:07:20 +01:00
|
|
|
;; By default clicking on a button does not select the window
|
|
|
|
;; containing the button (as opposed to clicking on a widget which
|
|
|
|
;; does). This means that the button action is then executed in the
|
|
|
|
;; current selected window which can cause problems if the button
|
|
|
|
;; changes the buffer (e.g., id: links) or moves point.
|
|
|
|
;;
|
|
|
|
;; This provides a button type which overrides mouse-action so that
|
|
|
|
;; the button's window is selected before the action is run. Other
|
|
|
|
;; notmuch buttons can get the same behaviour by inheriting from this
|
|
|
|
;; button type.
|
|
|
|
(define-button-type 'notmuch-button-type
|
|
|
|
'mouse-action (lambda (button)
|
|
|
|
(select-window (posn-window (event-start last-input-event)))
|
|
|
|
(button-activate button)))
|
|
|
|
|
2013-03-08 14:04:38 +01:00
|
|
|
(defun notmuch-command-to-string (&rest args)
|
|
|
|
"Synchronously invoke \"notmuch\" with the given list of arguments.
|
|
|
|
|
|
|
|
If notmuch exits with a non-zero status, output from the process
|
|
|
|
will appear in a buffer named \"*Notmuch errors*\" and an error
|
|
|
|
will be signaled.
|
|
|
|
|
|
|
|
Otherwise the output will be returned"
|
|
|
|
(with-temp-buffer
|
|
|
|
(let* ((status (apply #'call-process notmuch-command nil t nil args))
|
|
|
|
(output (buffer-string)))
|
|
|
|
(notmuch-check-exit-status status (cons notmuch-command args) output)
|
|
|
|
output)))
|
|
|
|
|
2010-04-22 11:03:32 +02:00
|
|
|
(defun notmuch-version ()
|
|
|
|
"Return a string with the notmuch version number."
|
|
|
|
(let ((long-string
|
|
|
|
;; Trim off the trailing newline.
|
2013-03-08 14:04:38 +01:00
|
|
|
(substring (notmuch-command-to-string "--version") 0 -1)))
|
2010-04-22 11:03:32 +02:00
|
|
|
(if (string-match "^notmuch\\( version\\)? \\(.*\\)$"
|
|
|
|
long-string)
|
|
|
|
(match-string 2 long-string)
|
|
|
|
"unknown")))
|
|
|
|
|
2010-10-28 01:58:44 +02:00
|
|
|
(defun notmuch-config-get (item)
|
|
|
|
"Return a value from the notmuch configuration."
|
2010-10-28 01:27:43 +02:00
|
|
|
;; Trim off the trailing newline
|
2013-03-08 14:04:38 +01:00
|
|
|
(substring (notmuch-command-to-string "config" "get" item) 0 -1))
|
2010-10-28 01:27:43 +02:00
|
|
|
|
2010-10-28 01:58:44 +02:00
|
|
|
(defun notmuch-database-path ()
|
|
|
|
"Return the database.path value from the notmuch configuration."
|
|
|
|
(notmuch-config-get "database.path"))
|
|
|
|
|
|
|
|
(defun notmuch-user-name ()
|
|
|
|
"Return the user.name value from the notmuch configuration."
|
|
|
|
(notmuch-config-get "user.name"))
|
|
|
|
|
|
|
|
(defun notmuch-user-primary-email ()
|
|
|
|
"Return the user.primary_email value from the notmuch configuration."
|
|
|
|
(notmuch-config-get "user.primary_email"))
|
|
|
|
|
2011-05-24 23:26:20 +02:00
|
|
|
(defun notmuch-user-other-email ()
|
2011-06-20 22:14:21 +02:00
|
|
|
"Return the user.other_email value (as a list) from the notmuch configuration."
|
2011-05-24 23:26:20 +02:00
|
|
|
(split-string (notmuch-config-get "user.other_email") "\n"))
|
|
|
|
|
2010-11-06 21:49:28 +01:00
|
|
|
(defun notmuch-kill-this-buffer ()
|
|
|
|
"Kill the current buffer."
|
|
|
|
(interactive)
|
|
|
|
(kill-buffer (current-buffer)))
|
|
|
|
|
2012-01-30 11:16:01 +01:00
|
|
|
(defun notmuch-prettify-subject (subject)
|
|
|
|
;; This function is used by `notmuch-search-process-filter' which
|
|
|
|
;; requires that we not disrupt its' matching state.
|
|
|
|
(save-match-data
|
|
|
|
(if (and subject
|
|
|
|
(string-match "^[ \t]*$" subject))
|
|
|
|
"[No Subject]"
|
|
|
|
subject)))
|
|
|
|
|
2012-10-26 22:18:10 +02:00
|
|
|
(defun notmuch-escape-boolean-term (term)
|
|
|
|
"Escape a boolean term for use in a query.
|
|
|
|
|
|
|
|
The caller is responsible for prepending the term prefix and a
|
|
|
|
colon. This performs minimal escaping in order to produce
|
|
|
|
user-friendly queries."
|
|
|
|
|
|
|
|
(save-match-data
|
|
|
|
(if (or (equal term "")
|
|
|
|
(string-match "[ ()]\\|^\"" term))
|
|
|
|
;; Requires escaping
|
|
|
|
(concat "\"" (replace-regexp-in-string "\"" "\"\"" term t t) "\"")
|
|
|
|
term)))
|
|
|
|
|
2012-03-27 03:37:16 +02:00
|
|
|
(defun notmuch-id-to-query (id)
|
|
|
|
"Return a query that matches the message with id ID."
|
2012-10-26 22:18:10 +02:00
|
|
|
(concat "id:" (notmuch-escape-boolean-term id)))
|
2012-03-27 03:37:16 +02:00
|
|
|
|
2010-04-22 11:03:32 +02:00
|
|
|
;;
|
|
|
|
|
2010-09-18 21:48:21 +02:00
|
|
|
(defun notmuch-common-do-stash (text)
|
|
|
|
"Common function to stash text in kill ring, and display in minibuffer."
|
2012-12-05 13:20:54 +01:00
|
|
|
(if text
|
|
|
|
(progn
|
|
|
|
(kill-new text)
|
|
|
|
(message "Stashed: %s" text))
|
|
|
|
;; There is nothing to stash so stash an empty string so the user
|
|
|
|
;; doesn't accidentally paste something else somewhere.
|
|
|
|
(kill-new "")
|
|
|
|
(message "Nothing to stash!")))
|
2010-09-18 21:48:21 +02:00
|
|
|
|
|
|
|
;;
|
|
|
|
|
2011-05-25 23:21:54 +02:00
|
|
|
(defun notmuch-remove-if-not (predicate list)
|
|
|
|
"Return a copy of LIST with all items not satisfying PREDICATE removed."
|
|
|
|
(let (out)
|
|
|
|
(while list
|
|
|
|
(when (funcall predicate (car list))
|
|
|
|
(push (car list) out))
|
|
|
|
(setq list (cdr list)))
|
|
|
|
(nreverse out)))
|
|
|
|
|
2012-03-18 17:32:40 +01:00
|
|
|
(defun notmuch-split-content-type (content-type)
|
|
|
|
"Split content/type into 'content' and 'type'"
|
|
|
|
(split-string content-type "/"))
|
|
|
|
|
|
|
|
(defun notmuch-match-content-type (t1 t2)
|
|
|
|
"Return t if t1 and t2 are matching content types, taking wildcards into account"
|
|
|
|
(let ((st1 (notmuch-split-content-type t1))
|
|
|
|
(st2 (notmuch-split-content-type t2)))
|
|
|
|
(if (or (string= (cadr st1) "*")
|
|
|
|
(string= (cadr st2) "*"))
|
2012-03-25 01:43:28 +01:00
|
|
|
;; Comparison of content types should be case insensitive.
|
|
|
|
(string= (downcase (car st1)) (downcase (car st2)))
|
|
|
|
(string= (downcase t1) (downcase t2)))))
|
2012-03-18 17:32:40 +01:00
|
|
|
|
|
|
|
(defvar notmuch-multipart/alternative-discouraged
|
|
|
|
'(
|
|
|
|
;; Avoid HTML parts.
|
|
|
|
"text/html"
|
|
|
|
;; multipart/related usually contain a text/html part and some associated graphics.
|
|
|
|
"multipart/related"
|
|
|
|
))
|
|
|
|
|
|
|
|
(defun notmuch-multipart/alternative-choose (types)
|
|
|
|
"Return a list of preferred types from the given list of types"
|
|
|
|
;; Based on `mm-preferred-alternative-precedence'.
|
|
|
|
(let ((seq types))
|
|
|
|
(dolist (pref (reverse notmuch-multipart/alternative-discouraged))
|
|
|
|
(dolist (elem (copy-sequence seq))
|
|
|
|
(when (string-match pref elem)
|
|
|
|
(setq seq (nconc (delete elem seq) (list elem))))))
|
|
|
|
seq))
|
|
|
|
|
2012-03-18 17:32:42 +01:00
|
|
|
(defun notmuch-parts-filter-by-type (parts type)
|
|
|
|
"Given a list of message parts, return a list containing the ones matching
|
|
|
|
the given type."
|
|
|
|
(remove-if-not
|
|
|
|
(lambda (part) (notmuch-match-content-type (plist-get part :content-type) type))
|
|
|
|
parts))
|
|
|
|
|
|
|
|
;; Helper for parts which are generally not included in the default
|
2013-07-06 14:49:51 +02:00
|
|
|
;; SEXP output.
|
2012-03-27 03:40:26 +02:00
|
|
|
(defun notmuch-get-bodypart-internal (query part-number process-crypto)
|
2012-03-18 17:32:42 +01:00
|
|
|
(let ((args '("show" "--format=raw"))
|
|
|
|
(part-arg (format "--part=%s" part-number)))
|
|
|
|
(setq args (append args (list part-arg)))
|
|
|
|
(if process-crypto
|
|
|
|
(setq args (append args '("--decrypt"))))
|
2012-03-27 03:40:26 +02:00
|
|
|
(setq args (append args (list query)))
|
2012-03-18 17:32:42 +01:00
|
|
|
(with-temp-buffer
|
|
|
|
(let ((coding-system-for-read 'no-conversion))
|
|
|
|
(progn
|
|
|
|
(apply 'call-process (append (list notmuch-command nil (list t nil) nil) args))
|
|
|
|
(buffer-string))))))
|
|
|
|
|
|
|
|
(defun notmuch-get-bodypart-content (msg part nth process-crypto)
|
|
|
|
(or (plist-get part :content)
|
2012-03-27 03:37:16 +02:00
|
|
|
(notmuch-get-bodypart-internal (notmuch-id-to-query (plist-get msg :id)) nth process-crypto)))
|
2012-03-18 17:32:42 +01:00
|
|
|
|
2012-09-29 20:03:43 +02:00
|
|
|
;; Workaround: The call to `mm-display-part' below triggers a bug in
|
|
|
|
;; Emacs 24 if it attempts to use the shr renderer to display an HTML
|
|
|
|
;; part with images in it (demonstrated in 24.1 and 24.2 on Debian and
|
|
|
|
;; Fedora 17, though unreproducable in other configurations).
|
|
|
|
;; `mm-shr' references the variable `gnus-inhibit-images' without
|
|
|
|
;; first loading gnus-art, which defines it, resulting in a
|
|
|
|
;; void-variable error. Hence, we advise `mm-shr' to ensure gnus-art
|
|
|
|
;; is loaded.
|
|
|
|
(if (>= emacs-major-version 24)
|
|
|
|
(defadvice mm-shr (before load-gnus-arts activate)
|
|
|
|
(require 'gnus-art nil t)
|
|
|
|
(ad-disable-advice 'mm-shr 'before 'load-gnus-arts)))
|
|
|
|
|
2012-05-05 21:30:37 +02:00
|
|
|
(defun notmuch-mm-display-part-inline (msg part nth content-type process-crypto)
|
|
|
|
"Use the mm-decode/mm-view functions to display a part in the
|
|
|
|
current buffer, if possible."
|
|
|
|
(let ((display-buffer (current-buffer)))
|
|
|
|
(with-temp-buffer
|
2012-05-20 18:58:14 +02:00
|
|
|
;; In case there is :content, the content string is already converted
|
|
|
|
;; into emacs internal format. `gnus-decoded' is a fake charset,
|
|
|
|
;; which means no further decoding (to be done by mm- functions).
|
|
|
|
(let* ((charset (if (plist-member part :content)
|
|
|
|
'gnus-decoded
|
|
|
|
(plist-get part :content-charset)))
|
2012-05-05 21:30:37 +02:00
|
|
|
(handle (mm-make-handle (current-buffer) `(,content-type (charset . ,charset)))))
|
|
|
|
;; If the user wants the part inlined, insert the content and
|
|
|
|
;; test whether we are able to inline it (which includes both
|
|
|
|
;; capability and suitability tests).
|
|
|
|
(when (mm-inlined-p handle)
|
|
|
|
(insert (notmuch-get-bodypart-content msg part nth process-crypto))
|
|
|
|
(when (mm-inlinable-p handle)
|
|
|
|
(set-buffer display-buffer)
|
|
|
|
(mm-display-part handle)
|
|
|
|
t))))))
|
|
|
|
|
2012-04-01 17:24:21 +02:00
|
|
|
;; Converts a plist of headers to an alist of headers. The input plist should
|
|
|
|
;; have symbols of the form :Header as keys, and the resulting alist will have
|
|
|
|
;; symbols of the form 'Header as keys.
|
|
|
|
(defun notmuch-headers-plist-to-alist (plist)
|
2012-03-18 17:32:42 +01:00
|
|
|
(loop for (key value . rest) on plist by #'cddr
|
2012-04-01 17:24:21 +02:00
|
|
|
collect (cons (intern (substring (symbol-name key) 1)) value)))
|
2012-03-18 17:32:42 +01:00
|
|
|
|
2013-02-04 22:37:01 +01:00
|
|
|
(defun notmuch-face-ensure-list-form (face)
|
|
|
|
"Return FACE in face list form.
|
|
|
|
|
|
|
|
If FACE is already a face list, it will be returned as-is. If
|
|
|
|
FACE is a face name or face plist, it will be returned as a
|
|
|
|
single element face list."
|
|
|
|
(if (and (listp face) (not (keywordp (car face))))
|
|
|
|
face
|
|
|
|
(list face)))
|
|
|
|
|
2013-02-04 22:37:02 +01:00
|
|
|
(defun notmuch-combine-face-text-property (start end face &optional below object)
|
2012-07-21 19:37:06 +02:00
|
|
|
"Combine FACE into the 'face text property between START and END.
|
|
|
|
|
|
|
|
This function combines FACE with any existing faces between START
|
2013-02-04 22:37:02 +01:00
|
|
|
and END in OBJECT (which defaults to the current buffer).
|
|
|
|
Attributes specified by FACE take precedence over existing
|
|
|
|
attributes unless BELOW is non-nil. FACE must be a face name (a
|
|
|
|
symbol or string), a property list of face attributes, or a list
|
|
|
|
of these. For convenience when applied to strings, this returns
|
|
|
|
OBJECT."
|
2012-07-21 19:37:06 +02:00
|
|
|
|
2013-02-04 22:37:01 +01:00
|
|
|
;; A face property can have three forms: a face name (a string or
|
|
|
|
;; symbol), a property list, or a list of these two forms. In the
|
|
|
|
;; list case, the faces will be combined, with the earlier faces
|
|
|
|
;; taking precedent. Here we canonicalize everything to list form
|
|
|
|
;; to make it easy to combine.
|
|
|
|
(let ((pos start)
|
|
|
|
(face-list (notmuch-face-ensure-list-form face)))
|
2012-07-21 19:37:06 +02:00
|
|
|
(while (< pos end)
|
2013-02-04 22:37:02 +01:00
|
|
|
(let* ((cur (get-text-property pos 'face object))
|
2013-02-04 22:37:01 +01:00
|
|
|
(cur-list (notmuch-face-ensure-list-form cur))
|
|
|
|
(new (cond ((null cur-list) face)
|
2013-02-04 22:37:02 +01:00
|
|
|
(below (append cur-list face-list))
|
2013-02-04 22:37:01 +01:00
|
|
|
(t (append face-list cur-list))))
|
2013-02-04 22:37:02 +01:00
|
|
|
(next (next-single-property-change pos 'face object end)))
|
|
|
|
(put-text-property pos next 'face new object)
|
|
|
|
(setq pos next))))
|
|
|
|
object)
|
2012-07-21 19:37:06 +02:00
|
|
|
|
2013-03-23 12:29:53 +01:00
|
|
|
(defun notmuch-combine-face-text-property-string (string face &optional below)
|
|
|
|
(notmuch-combine-face-text-property
|
|
|
|
0
|
|
|
|
(length string)
|
|
|
|
face
|
|
|
|
below
|
|
|
|
string))
|
2013-05-30 03:13:45 +02:00
|
|
|
|
|
|
|
(defun notmuch-map-text-property (start end prop func &optional object)
|
|
|
|
"Transform text property PROP using FUNC.
|
|
|
|
|
|
|
|
Applies FUNC to each distinct value of the text property PROP
|
|
|
|
between START and END of OBJECT, setting PROP to the value
|
|
|
|
returned by FUNC."
|
|
|
|
(while (< start end)
|
|
|
|
(let ((value (get-text-property start prop object))
|
|
|
|
(next (next-single-property-change start prop object end)))
|
|
|
|
(put-text-property start next prop (funcall func value) object)
|
|
|
|
(setq start next))))
|
2013-03-23 12:29:53 +01:00
|
|
|
|
2013-01-03 22:47:49 +01:00
|
|
|
(defun notmuch-logged-error (msg &optional extra)
|
|
|
|
"Log MSG and EXTRA to *Notmuch errors* and signal MSG.
|
|
|
|
|
|
|
|
This logs MSG and EXTRA to the *Notmuch errors* buffer and
|
|
|
|
signals MSG as an error. If EXTRA is non-nil, text referring the
|
|
|
|
user to the *Notmuch errors* buffer will be appended to the
|
|
|
|
signaled error. This function does not return."
|
|
|
|
|
|
|
|
(with-current-buffer (get-buffer-create "*Notmuch errors*")
|
|
|
|
(goto-char (point-max))
|
|
|
|
(unless (bobp)
|
|
|
|
(newline))
|
|
|
|
(save-excursion
|
|
|
|
(insert "[" (current-time-string) "]\n" msg)
|
|
|
|
(unless (bolp)
|
|
|
|
(newline))
|
|
|
|
(when extra
|
|
|
|
(insert extra)
|
2012-12-15 21:04:14 +01:00
|
|
|
(unless (bolp)
|
2013-01-03 22:47:49 +01:00
|
|
|
(newline)))))
|
|
|
|
(error "%s" (concat msg (when extra
|
|
|
|
" (see *Notmuch errors* for more details)"))))
|
2012-12-15 21:04:14 +01:00
|
|
|
|
2013-06-01 02:40:04 +02:00
|
|
|
(defun notmuch-check-async-exit-status (proc msg &optional command err-file)
|
2012-12-15 21:04:19 +01:00
|
|
|
"If PROC exited abnormally, pop up an error buffer and signal an error.
|
|
|
|
|
|
|
|
This is a wrapper around `notmuch-check-exit-status' for
|
|
|
|
asynchronous process sentinels. PROC and MSG must be the
|
2013-06-01 02:40:04 +02:00
|
|
|
arguments passed to the sentinel. COMMAND and ERR-FILE, if
|
|
|
|
provided, are passed to `notmuch-check-exit-status'. If COMMAND
|
|
|
|
is not provided, it is taken from `process-command'."
|
2012-12-15 21:04:19 +01:00
|
|
|
(let ((exit-status
|
|
|
|
(case (process-status proc)
|
|
|
|
((exit) (process-exit-status proc))
|
|
|
|
((signal) msg))))
|
|
|
|
(when exit-status
|
2013-06-01 02:40:04 +02:00
|
|
|
(notmuch-check-exit-status exit-status (or command (process-command proc))
|
|
|
|
nil err-file))))
|
2012-12-15 21:04:19 +01:00
|
|
|
|
2012-12-15 21:04:14 +01:00
|
|
|
(defun notmuch-check-exit-status (exit-status command &optional output err-file)
|
|
|
|
"If EXIT-STATUS is non-zero, pop up an error buffer and signal an error.
|
|
|
|
|
|
|
|
If EXIT-STATUS is non-zero, pop up a notmuch error buffer
|
|
|
|
describing the error and signal an Elisp error. EXIT-STATUS must
|
|
|
|
be a number indicating the exit status code of a process or a
|
|
|
|
string describing the signal that terminated the process (such as
|
|
|
|
returned by `call-process'). COMMAND must be a list giving the
|
|
|
|
command and its arguments. OUTPUT, if provided, is a string
|
|
|
|
giving the output of command. ERR-FILE, if provided, is the name
|
|
|
|
of a file containing the error output of command. OUTPUT and the
|
|
|
|
contents of ERR-FILE will be included in the error message."
|
|
|
|
|
|
|
|
(cond
|
|
|
|
((eq exit-status 0) t)
|
2012-12-16 04:17:28 +01:00
|
|
|
((eq exit-status 20)
|
2013-01-03 22:47:49 +01:00
|
|
|
(notmuch-logged-error "notmuch CLI version mismatch
|
2012-12-16 04:17:28 +01:00
|
|
|
Emacs requested an older output format than supported by the notmuch CLI.
|
2013-01-03 22:47:49 +01:00
|
|
|
You may need to restart Emacs or upgrade your notmuch Emacs package."))
|
2012-12-16 04:17:28 +01:00
|
|
|
((eq exit-status 21)
|
2013-01-03 22:47:49 +01:00
|
|
|
(notmuch-logged-error "notmuch CLI version mismatch
|
2012-12-16 04:17:28 +01:00
|
|
|
Emacs requested a newer output format than supported by the notmuch CLI.
|
2013-01-03 22:47:49 +01:00
|
|
|
You may need to restart Emacs or upgrade your notmuch package."))
|
2012-12-15 21:04:14 +01:00
|
|
|
(t
|
2013-01-03 22:47:49 +01:00
|
|
|
(let* ((err (when err-file
|
|
|
|
(with-temp-buffer
|
|
|
|
(insert-file-contents err-file)
|
|
|
|
(unless (eobp)
|
|
|
|
(buffer-string)))))
|
|
|
|
(extra
|
|
|
|
(concat
|
|
|
|
"command: " (mapconcat #'shell-quote-argument command " ") "\n"
|
|
|
|
(if (integerp exit-status)
|
|
|
|
(format "exit status: %s\n" exit-status)
|
|
|
|
(format "exit signal: %s\n" exit-status))
|
|
|
|
(when err
|
|
|
|
(concat "stderr:\n" err))
|
|
|
|
(when output
|
|
|
|
(concat "stdout:\n" output)))))
|
|
|
|
(if err
|
|
|
|
;; We have an error message straight from the CLI.
|
|
|
|
(notmuch-logged-error
|
emacs: Fix trimming regexp in notmuch-check-exit-status
For such a simple regexp, this was broken in a very complicated way.
The intent was to strip the newline (and potentially other whitespace)
off the end of the error string so there wasn't an extra newline in
the error signal. However, the regexp was deeply dependent on the
active syntax table and the subtleties of $. We didn't notice this
because all notmuch major modes put ?\n in the whitespace class, which
makes this behaved as intended: the "\\s " matches all newlines, but
by matching the newline character, causes the $ *not* to match
*except* where it matched the empty string at the very end of the
string, which was not followed by a newline.
However, if the syntax table declares ?\n to be non-whitespace
(lisp-mode declares it as endcomment, and is likely to be the mode
you're in when testing functions), then this regexp behaves completely
differently, matching trailing spaces at the end of every line within
the string.
The solution is to say what we mean for whitespace *and* to switch
from $ to \', which matches only the end of the string, rather than
the end of each line. Both are necessary or this will strip away
interior newlines, which is not what we want.
2013-05-17 22:14:03 +02:00
|
|
|
(replace-regexp-in-string "[ \n\r\t\f]*\\'" "" err) extra)
|
2013-01-03 22:47:49 +01:00
|
|
|
;; We only have combined output from the CLI; don't inundate
|
|
|
|
;; the user with it. Mimic `process-lines'.
|
|
|
|
(notmuch-logged-error (format "%s exited with status %s"
|
|
|
|
(car command) exit-status)
|
|
|
|
extra))
|
|
|
|
;; `notmuch-logged-error' does not return.
|
|
|
|
))))
|
2012-12-15 21:04:14 +01:00
|
|
|
|
2013-06-24 01:43:17 +02:00
|
|
|
(defun notmuch-call-notmuch-sexp (&rest args)
|
|
|
|
"Invoke `notmuch-command' with ARGS and return the parsed S-exp output.
|
|
|
|
|
|
|
|
If notmuch exits with a non-zero status, this will pop up a
|
|
|
|
buffer containing notmuch's output and signal an error."
|
|
|
|
|
|
|
|
(with-temp-buffer
|
|
|
|
(let ((err-file (make-temp-file "nmerr")))
|
|
|
|
(unwind-protect
|
|
|
|
(let ((status (apply #'call-process
|
|
|
|
notmuch-command nil (list t err-file) nil args)))
|
|
|
|
(notmuch-check-exit-status status (cons notmuch-command args)
|
|
|
|
(buffer-string) err-file)
|
|
|
|
(goto-char (point-min))
|
|
|
|
(read (current-buffer)))
|
|
|
|
(delete-file err-file)))))
|
|
|
|
|
2013-06-01 02:40:04 +02:00
|
|
|
(defun notmuch-start-notmuch (name buffer sentinel &rest args)
|
|
|
|
"Start and return an asynchronous notmuch command.
|
|
|
|
|
|
|
|
This starts and returns an asynchronous process running
|
|
|
|
`notmuch-command' with ARGS. The exit status is checked via
|
|
|
|
`notmuch-check-async-exit-status'. Output written to stderr is
|
|
|
|
redirected and displayed when the process exits (even if the
|
|
|
|
process exits successfully). NAME and BUFFER are the same as in
|
|
|
|
`start-process'. SENTINEL is a process sentinel function to call
|
|
|
|
when the process exits, or nil for none. The caller must *not*
|
|
|
|
invoke `set-process-sentinel' directly on the returned process,
|
|
|
|
as that will interfere with the handling of stderr and the exit
|
|
|
|
status."
|
|
|
|
|
|
|
|
;; There is no way (as of Emacs 24.3) to capture stdout and stderr
|
|
|
|
;; separately for asynchronous processes, or even to redirect stderr
|
|
|
|
;; to a file, so we use a trivial shell wrapper to send stderr to a
|
|
|
|
;; temporary file and clean things up in the sentinel.
|
|
|
|
(let* ((err-file (make-temp-file "nmerr"))
|
|
|
|
;; Use a pipe
|
|
|
|
(process-connection-type nil)
|
|
|
|
;; Find notmuch using Emacs' `exec-path'
|
|
|
|
(command (or (executable-find notmuch-command)
|
|
|
|
(error "command not found: %s" notmuch-command)))
|
|
|
|
(proc (apply #'start-process name buffer
|
|
|
|
"/bin/sh" "-c"
|
|
|
|
"exec 2>\"$1\"; shift; exec \"$0\" \"$@\""
|
|
|
|
command err-file args)))
|
|
|
|
(process-put proc 'err-file err-file)
|
|
|
|
(process-put proc 'sub-sentinel sentinel)
|
|
|
|
(process-put proc 'real-command (cons notmuch-command args))
|
|
|
|
(set-process-sentinel proc #'notmuch-start-notmuch-sentinel)
|
|
|
|
proc))
|
|
|
|
|
|
|
|
(defun notmuch-start-notmuch-sentinel (proc event)
|
|
|
|
(let ((err-file (process-get proc 'err-file))
|
|
|
|
(sub-sentinel (process-get proc 'sub-sentinel))
|
|
|
|
(real-command (process-get proc 'real-command)))
|
|
|
|
(condition-case err
|
|
|
|
(progn
|
|
|
|
;; Invoke the sub-sentinel, if any
|
|
|
|
(when sub-sentinel
|
|
|
|
(funcall sub-sentinel proc event))
|
|
|
|
;; Check the exit status. This will signal an error if the
|
2013-06-09 06:45:37 +02:00
|
|
|
;; exit status is non-zero. Don't do this if the process
|
|
|
|
;; buffer is dead since that means Emacs killed the process
|
|
|
|
;; and there's no point in telling the user that (but we
|
|
|
|
;; still check for and report stderr output below).
|
|
|
|
(when (buffer-live-p (process-buffer proc))
|
|
|
|
(notmuch-check-async-exit-status proc event real-command err-file))
|
2013-06-01 02:40:04 +02:00
|
|
|
;; If that didn't signal an error, then any error output was
|
|
|
|
;; really warning output. Show warnings, if any.
|
|
|
|
(let ((warnings
|
|
|
|
(with-temp-buffer
|
|
|
|
(unless (= (second (insert-file-contents err-file)) 0)
|
|
|
|
(end-of-line)
|
|
|
|
;; Show first line; stuff remaining lines in the
|
|
|
|
;; errors buffer.
|
|
|
|
(let ((l1 (buffer-substring (point-min) (point))))
|
|
|
|
(skip-chars-forward "\n")
|
|
|
|
(cons l1 (unless (eobp)
|
|
|
|
(buffer-substring (point) (point-max)))))))))
|
|
|
|
(when warnings
|
|
|
|
(notmuch-logged-error (car warnings) (cdr warnings)))))
|
|
|
|
(error
|
|
|
|
;; Emacs behaves strangely if an error escapes from a sentinel,
|
|
|
|
;; so turn errors into messages.
|
|
|
|
(message "%s" (error-message-string err))))
|
|
|
|
(ignore-errors (delete-file err-file))))
|
|
|
|
|
2011-05-26 03:01:19 +02:00
|
|
|
;; This variable is used only buffer local, but it needs to be
|
|
|
|
;; declared globally first to avoid compiler warnings.
|
|
|
|
(defvar notmuch-show-process-crypto nil)
|
|
|
|
(make-variable-buffer-local 'notmuch-show-process-crypto)
|
|
|
|
|
2012-10-27 11:34:12 +02:00
|
|
|
|
2010-04-01 19:36:21 +02:00
|
|
|
(provide 'notmuch-lib)
|
2010-09-18 21:48:21 +02:00
|
|
|
|
2012-03-29 06:33:42 +02:00
|
|
|
;; Local Variables:
|
|
|
|
;; byte-compile-warnings: (not cl-functions)
|
|
|
|
;; End:
|