From 0c565fa29fc29f74209d4343e2fc88f3b8008aaa Mon Sep 17 00:00:00 2001 From: Tomi Ollila Date: Sun, 2 Aug 2015 17:48:13 +0300 Subject: [PATCH 1/1] emacs: renamed function notmuch-version to notmuch-cli-version As it asks `notmuch` binary for its version number. --- emacs/notmuch-hello.el | 2 +- emacs/notmuch-lib.el | 4 ++-- emacs/notmuch-mua.el | 2 +- 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." -- 2.43.0