1 Return-Path: <too@guru-group.fi>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by arlo.cworth.org (Postfix) with ESMTP id 0F7196DE1585
\r
6 for <notmuch@notmuchmail.org>; Sun, 2 Aug 2015 07:48:48 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at cworth.org
\r
11 X-Spam-Status: No, score=0.308 tagged_above=-999 required=5 tests=[AWL=0.848,
\r
12 RP_MATCHES_RCVD=-0.55, T_HEADER_FROM_DIFFERENT_DOMAINS=0.01]
\r
14 Received: from arlo.cworth.org ([127.0.0.1])
\r
15 by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)
\r
16 with ESMTP id KHEEkxRNtPCE for <notmuch@notmuchmail.org>;
\r
17 Sun, 2 Aug 2015 07:48:45 -0700 (PDT)
\r
18 Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])
\r
19 by arlo.cworth.org (Postfix) with ESMTP id BDC9C6DE1413
\r
20 for <notmuch@notmuchmail.org>; Sun, 2 Aug 2015 07:48:44 -0700 (PDT)
\r
21 Received: by guru.guru-group.fi (Postfix, from userid 501)
\r
22 id 3770010009D; Sun, 2 Aug 2015 17:48:25 +0300 (EEST)
\r
23 From: Tomi Ollila <tomi.ollila@iki.fi>
\r
24 To: notmuch@notmuchmail.org,
\r
25 markwalters1009@gmail.com,
\r
27 Subject: [PATCH 1/2] emacs: renamed function notmuch-version to
\r
29 Date: Sun, 2 Aug 2015 17:48:13 +0300
\r
30 Message-Id: <1438526894-19657-1-git-send-email-tomi.ollila@iki.fi>
\r
31 X-Mailer: git-send-email 2.0.0
\r
32 Cc: tomi.ollila@iki.fi
\r
33 X-BeenThere: notmuch@notmuchmail.org
\r
34 X-Mailman-Version: 2.1.18
\r
36 List-Id: "Use and development of the notmuch mail system."
\r
37 <notmuch.notmuchmail.org>
\r
38 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
39 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
40 List-Archive: <http://notmuchmail.org/pipermail/notmuch/>
\r
41 List-Post: <mailto:notmuch@notmuchmail.org>
\r
42 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
43 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
44 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
45 X-List-Received-Date: Sun, 02 Aug 2015 14:48:48 -0000
\r
47 As it asks `notmuch` binary for its version number.
\r
50 This is 3rd revision, previous in id:1426932955-23174-1-git-send-email-tomi.ollila@iki.fi
\r
52 emacs/notmuch-hello.el | 2 +-
\r
53 emacs/notmuch-lib.el | 4 ++--
\r
54 emacs/notmuch-mua.el | 2 +-
\r
55 3 files changed, 4 insertions(+), 4 deletions(-)
\r
57 diff --git a/emacs/notmuch-hello.el b/emacs/notmuch-hello.el
\r
58 index 65d0627..7bfa752 100644
\r
59 --- a/emacs/notmuch-hello.el
\r
60 +++ b/emacs/notmuch-hello.el
\r
61 @@ -628,7 +628,7 @@ (defvar notmuch-emacs-version)
\r
62 (defun notmuch-hello-versions ()
\r
63 "Display the notmuch version(s)"
\r
65 - (let ((notmuch-cli-version (notmuch-version)))
\r
66 + (let ((notmuch-cli-version (notmuch-cli-version)))
\r
67 (message "notmuch version %s"
\r
68 (if (string= notmuch-emacs-version notmuch-cli-version)
\r
70 diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el
\r
71 index f8e5165..e16a1b9 100644
\r
72 --- a/emacs/notmuch-lib.el
\r
73 +++ b/emacs/notmuch-lib.el
\r
74 @@ -192,8 +192,8 @@ (defun notmuch-assert-cli-sane ()
\r
75 "Perhaps you haven't run \"notmuch setup\" yet? Try running this
\r
76 on the command line, and then retry your notmuch command")))
\r
78 -(defun notmuch-version ()
\r
79 - "Return a string with the notmuch version number."
\r
80 +(defun notmuch-cli-version ()
\r
81 + "Return a string with the notmuch cli command version number."
\r
83 ;; Trim off the trailing newline.
\r
84 (substring (notmuch-command-to-string "--version") 0 -1)))
\r
85 diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el
\r
86 index 33f1399..934f6c9 100644
\r
87 --- a/emacs/notmuch-mua.el
\r
88 +++ b/emacs/notmuch-mua.el
\r
89 @@ -118,7 +118,7 @@ (defun notmuch-mua-user-agent-full ()
\r
91 (defun notmuch-mua-user-agent-notmuch ()
\r
92 "Generate a `User-Agent:' string suitable for notmuch."
\r
93 - (concat "Notmuch/" (notmuch-version) " (http://notmuchmail.org)"))
\r
94 + (concat "Notmuch/" (notmuch-cli-version) " (http://notmuchmail.org)"))
\r
96 (defun notmuch-mua-user-agent-emacs ()
\r
97 "Generate a `User-Agent:' string suitable for notmuch."
\r