From: Tomi Ollila <tomi.ollila@iki.fi>
Date: Sun, 2 Aug 2015 14:48:13 +0000 (+0300)
Subject: [PATCH 1/2] emacs: renamed function notmuch-version to notmuch-cli-version
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4cf1f0289a10b1c8150c8780f84a89168868ec08;p=notmuch-archives.git

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

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