emacs: renamed function notmuch-version to notmuch-cli-version

As it asks `notmuch` binary for its version number.
This commit is contained in:
Tomi Ollila 2015-08-02 17:48:13 +03:00 committed by David Bremner
parent 6d5c7b3ca5
commit 0c565fa29f
3 changed files with 4 additions and 4 deletions

View file

@ -628,7 +628,7 @@ with `notmuch-hello-query-counts'."
(defun notmuch-hello-versions () (defun notmuch-hello-versions ()
"Display the notmuch version(s)" "Display the notmuch version(s)"
(interactive) (interactive)
(let ((notmuch-cli-version (notmuch-version))) (let ((notmuch-cli-version (notmuch-cli-version)))
(message "notmuch version %s" (message "notmuch version %s"
(if (string= notmuch-emacs-version notmuch-cli-version) (if (string= notmuch-emacs-version notmuch-cli-version)
notmuch-cli-version notmuch-cli-version

View file

@ -192,8 +192,8 @@ Otherwise the output will be returned"
"Perhaps you haven't run \"notmuch setup\" yet? Try running this "Perhaps you haven't run \"notmuch setup\" yet? Try running this
on the command line, and then retry your notmuch command"))) on the command line, and then retry your notmuch command")))
(defun notmuch-version () (defun notmuch-cli-version ()
"Return a string with the notmuch version number." "Return a string with the notmuch cli command version number."
(let ((long-string (let ((long-string
;; Trim off the trailing newline. ;; Trim off the trailing newline.
(substring (notmuch-command-to-string "--version") 0 -1))) (substring (notmuch-command-to-string "--version") 0 -1)))

View file

@ -118,7 +118,7 @@ Note that these functions use `mail-citation-hook' if that is non-nil."
(defun notmuch-mua-user-agent-notmuch () (defun notmuch-mua-user-agent-notmuch ()
"Generate a `User-Agent:' string suitable for notmuch." "Generate a `User-Agent:' string suitable for notmuch."
(concat "Notmuch/" (notmuch-version) " (http://notmuchmail.org)")) (concat "Notmuch/" (notmuch-cli-version) " (http://notmuchmail.org)"))
(defun notmuch-mua-user-agent-emacs () (defun notmuch-mua-user-agent-emacs ()
"Generate a `User-Agent:' string suitable for notmuch." "Generate a `User-Agent:' string suitable for notmuch."