[PATCH 1/2] emacs: renamed function notmuch-version to notmuch-cli-version

diff --git a/28/e0ddaee26c487e6384373f4e089b89e6030830 b/28/e0ddaee26c487e6384373f4e089b89e6030830
new file mode 100644 (file)
index 0000000..4dec4f8
--- /dev/null
+++ b/28/e0ddaee26c487e6384373f4e089b89e6030830
@@ -0,0 +1,100 @@
+Return-Path: <too@guru-group.fi>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by arlo.cworth.org (Postfix) with ESMTP id 0F7196DE1585\r
+ for <notmuch@notmuchmail.org>; Sun,  2 Aug 2015 07:48:48 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.308\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.308 tagged_above=-999 required=5 tests=[AWL=0.848, \r
+ RP_MATCHES_RCVD=-0.55, T_HEADER_FROM_DIFFERENT_DOMAINS=0.01]\r
+ autolearn=disabled\r
+Received: from arlo.cworth.org ([127.0.0.1])\r
+ by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id KHEEkxRNtPCE for <notmuch@notmuchmail.org>;\r
+ Sun,  2 Aug 2015 07:48:45 -0700 (PDT)\r
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
+ by arlo.cworth.org (Postfix) with ESMTP id BDC9C6DE1413\r
+ for <notmuch@notmuchmail.org>; Sun,  2 Aug 2015 07:48:44 -0700 (PDT)\r
+Received: by guru.guru-group.fi (Postfix, from userid 501)\r
+ id 3770010009D; Sun,  2 Aug 2015 17:48:25 +0300 (EEST)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: notmuch@notmuchmail.org,\r
+       markwalters1009@gmail.com,\r
+       sojkam1@fel.cvut.cz\r
+Subject: [PATCH 1/2] emacs: renamed function notmuch-version to\r
+ notmuch-cli-version\r
+Date: Sun,  2 Aug 2015 17:48:13 +0300\r
+Message-Id: <1438526894-19657-1-git-send-email-tomi.ollila@iki.fi>\r
+X-Mailer: git-send-email 2.0.0\r
+Cc: tomi.ollila@iki.fi\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.18\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch/>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sun, 02 Aug 2015 14:48:48 -0000\r
+\r
+As it asks `notmuch` binary for its version number.\r
+---\r
+\r
+This is 3rd revision, previous in id:1426932955-23174-1-git-send-email-tomi.ollila@iki.fi\r
+\r
+ emacs/notmuch-hello.el | 2 +-\r
+ emacs/notmuch-lib.el   | 4 ++--\r
+ emacs/notmuch-mua.el   | 2 +-\r
+ 3 files changed, 4 insertions(+), 4 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-hello.el b/emacs/notmuch-hello.el\r
+index 65d0627..7bfa752 100644\r
+--- a/emacs/notmuch-hello.el\r
++++ b/emacs/notmuch-hello.el\r
+@@ -628,7 +628,7 @@ (defvar notmuch-emacs-version)\r
+ (defun notmuch-hello-versions ()\r
+   "Display the notmuch version(s)"\r
+   (interactive)\r
+-  (let ((notmuch-cli-version (notmuch-version)))\r
++  (let ((notmuch-cli-version (notmuch-cli-version)))\r
+     (message "notmuch version %s"\r
+            (if (string= notmuch-emacs-version notmuch-cli-version)\r
+                notmuch-cli-version\r
+diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el\r
+index f8e5165..e16a1b9 100644\r
+--- a/emacs/notmuch-lib.el\r
++++ b/emacs/notmuch-lib.el\r
+@@ -192,8 +192,8 @@ (defun notmuch-assert-cli-sane ()\r
+ "Perhaps you haven't run \"notmuch setup\" yet? Try running this\r
+ on the command line, and then retry your notmuch command")))\r
+ \r
+-(defun notmuch-version ()\r
+-  "Return a string with the notmuch version number."\r
++(defun notmuch-cli-version ()\r
++  "Return a string with the notmuch cli command version number."\r
+   (let ((long-string\r
+        ;; Trim off the trailing newline.\r
+        (substring (notmuch-command-to-string "--version") 0 -1)))\r
+diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el\r
+index 33f1399..934f6c9 100644\r
+--- a/emacs/notmuch-mua.el\r
++++ b/emacs/notmuch-mua.el\r
+@@ -118,7 +118,7 @@ (defun notmuch-mua-user-agent-full ()\r
+ \r
+ (defun notmuch-mua-user-agent-notmuch ()\r
+   "Generate a `User-Agent:' string suitable for notmuch."\r
+-  (concat "Notmuch/" (notmuch-version) " (http://notmuchmail.org)"))\r
++  (concat "Notmuch/" (notmuch-cli-version) " (http://notmuchmail.org)"))\r
+ \r
+ (defun notmuch-mua-user-agent-emacs ()\r
+   "Generate a `User-Agent:' string suitable for notmuch."\r
+-- \r
+1.9.3\r
+\r