[PATCH v4 3/3] emacs: defun notmuch-hello-versions and bind 'v' in hello mode to it

diff --git a/89/be7ae85c7553bb341c97a7aa9b6b3883b2a41f b/89/be7ae85c7553bb341c97a7aa9b6b3883b2a41f
new file mode 100644 (file)
index 0000000..4d0f32e
--- /dev/null
+++ b/89/be7ae85c7553bb341c97a7aa9b6b3883b2a41f
@@ -0,0 +1,88 @@
+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 olra.theworths.org (Postfix) with ESMTP id B98C9431FC0\r
+       for <notmuch@notmuchmail.org>; Wed, 19 Mar 2014 13:37:25 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id f7BvZwQ0MFSG for <notmuch@notmuchmail.org>;\r
+       Wed, 19 Mar 2014 13:37:21 -0700 (PDT)\r
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
+       by olra.theworths.org (Postfix) with ESMTP id CCA38431FAF\r
+       for <notmuch@notmuchmail.org>; Wed, 19 Mar 2014 13:37:20 -0700 (PDT)\r
+Received: by guru.guru-group.fi (Postfix, from userid 501)\r
+       id 760151000E7; Wed, 19 Mar 2014 22:37:16 +0200 (EET)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v4 3/3] emacs: defun notmuch-hello-versions and bind 'v' in\r
+       hello mode to it\r
+Date: Wed, 19 Mar 2014 22:37:11 +0200\r
+Message-Id: <1395261431-24668-3-git-send-email-tomi.ollila@iki.fi>\r
+X-Mailer: git-send-email 1.8.0\r
+In-Reply-To: <1395261431-24668-1-git-send-email-tomi.ollila@iki.fi>\r
+References: <1395261431-24668-1-git-send-email-tomi.ollila@iki.fi>\r
+Cc: tomi.ollila@iki.fi\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\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: Wed, 19 Mar 2014 20:37:25 -0000\r
+\r
+If notmuch cli & notmuch emacs MUA versions differ, print also the\r
+emacs MUA version string (along with the cli version) to the\r
+minibuffer.\r
+---\r
+ emacs/notmuch-hello.el | 15 +++++++++++++--\r
+ 1 file changed, 13 insertions(+), 2 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-hello.el b/emacs/notmuch-hello.el\r
+index e325cd3..e3a80f1 100644\r
+--- a/emacs/notmuch-hello.el\r
++++ b/emacs/notmuch-hello.el\r
+@@ -515,6 +515,18 @@ (defun notmuch-hello-window-configuration-change ()\r
+       (remove-hook 'window-configuration-change-hook\r
+                  #'notmuch-hello-window-configuration-change))))\r
+ \r
++;; the following variable is defined as being defconst in notmuch-version.el\r
++(defvar notmuch-emacs-version)\r
++\r
++(defun notmuch-hello-versions ()\r
++  "Display the notmuch version(s)"\r
++  (interactive)\r
++  (let ((notmuch-cli-version (notmuch-version)))\r
++    (message "notmuch version %s"\r
++           (if (string= notmuch-emacs-version notmuch-cli-version)\r
++               notmuch-cli-version\r
++             (concat notmuch-cli-version\r
++                     " (emacs mua version " notmuch-emacs-version ")")))))\r
+ \r
+ (defvar notmuch-hello-mode-map\r
+   (let ((map (if (fboundp 'make-composed-keymap)\r
+@@ -525,8 +537,7 @@ (defvar notmuch-hello-mode-map\r
+              ;; it's unlikely to change.\r
+              (copy-keymap widget-keymap))))\r
+     (set-keymap-parent map notmuch-common-keymap)\r
+-    (define-key map "v" (lambda () "Display the notmuch version" (interactive)\r
+-                        (message "notmuch version %s" (notmuch-version))))\r
++    (define-key map "v" 'notmuch-hello-versions)\r
+     (define-key map (kbd "<C-tab>") 'widget-backward)\r
+     map)\r
+   "Keymap for \"notmuch hello\" buffers.")\r
+-- \r
+1.8.0\r
+\r