aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomi Ollila <tomi.ollila@iki.fi>2015-08-02 17:48:13 +0300
committerDavid Bremner <david@tethera.net>2015-08-04 20:56:28 +0200
commit0c565fa29fc29f74209d4343e2fc88f3b8008aaa (patch)
treed15a0bede1d4f2a7474a5fc06d9dfd7c5a1b0827
parent6d5c7b3ca50cb2ce36d4a2d6e6f064afcba7410b (diff)
emacs: renamed function notmuch-version to notmuch-cli-version
As it asks `notmuch` binary for its version number.
-rw-r--r--emacs/notmuch-hello.el2
-rw-r--r--emacs/notmuch-lib.el4
-rw-r--r--emacs/notmuch-mua.el2
3 files changed, 4 insertions, 4 deletions
diff --git a/emacs/notmuch-hello.el b/emacs/notmuch-hello.el
index 65d06276..7bfa752d 100644
--- a/emacs/notmuch-hello.el
+++ b/emacs/notmuch-hello.el
@@ -628,7 +628,7 @@ with `notmuch-hello-query-counts'."
(defun notmuch-hello-versions ()
"Display the notmuch version(s)"
(interactive)
- (let ((notmuch-cli-version (notmuch-version)))
+ (let ((notmuch-cli-version (notmuch-cli-version)))
(message "notmuch version %s"
(if (string= notmuch-emacs-version notmuch-cli-version)
notmuch-cli-version
diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el
index f8e51658..e16a1b97 100644
--- a/emacs/notmuch-lib.el
+++ b/emacs/notmuch-lib.el
@@ -192,8 +192,8 @@ Otherwise the output will be returned"
"Perhaps you haven't run \"notmuch setup\" yet? Try running this
on the command line, and then retry your notmuch command")))
-(defun notmuch-version ()
- "Return a string with the notmuch version number."
+(defun notmuch-cli-version ()
+ "Return a string with the notmuch cli command version number."
(let ((long-string
;; Trim off the trailing newline.
(substring (notmuch-command-to-string "--version") 0 -1)))
diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el
index 33f13998..934f6c95 100644
--- a/emacs/notmuch-mua.el
+++ b/emacs/notmuch-mua.el
@@ -118,7 +118,7 @@ Note that these functions use `mail-citation-hook' if that is non-nil."
(defun notmuch-mua-user-agent-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 ()
"Generate a `User-Agent:' string suitable for notmuch."