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

As it asks `notmuch` binary for its version number.

diff --git a/emacs/notmuch-hello.el b/emacs/notmuch-hello.el
index 65d062760a71a5f00a940ec945886a87be73c388..7bfa752d2a04d3d3cc0244aac63299979fb9a88e 100644 (file)
--- 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)
 (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
     (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 f8e516583dfec6da1ae5fd9fbfa6d6a82377b0af..e16a1b971bd5e29bb3b78ba9f3a823c0b39acb85 100644 (file)
--- 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")))
 
 "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)))
   (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 33f139987e659135cb2aeb29767144455a26429e..934f6c95e8d4ec5c68fff40e1fac2c1b5ed42da9 100644 (file)
--- 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."
 
 (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."
 
 (defun notmuch-mua-user-agent-emacs ()
   "Generate a `User-Agent:' string suitable for notmuch."