[PATCH] emacs: tree/show remove duplicate function

diff --git a/92/910afd6a817d0addfb00ddd4f19af94259678d b/92/910afd6a817d0addfb00ddd4f19af94259678d
new file mode 100644 (file)
index 0000000..e6a3e0e
--- /dev/null
+++ b/92/910afd6a817d0addfb00ddd4f19af94259678d
@@ -0,0 +1,138 @@
+Return-Path: <markwalters1009@gmail.com>\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 BC0B640D1DF\r
+       for <notmuch@notmuchmail.org>; Sat,  7 Jun 2014 02:51:28 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.201\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.201 tagged_above=-999 required=5\r
+       tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+       FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001,\r
+       RCVD_IN_DNSWL_LOW=-0.7] 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 ReuFuJTc7pUq for <notmuch@notmuchmail.org>;\r
+       Sat,  7 Jun 2014 02:51:23 -0700 (PDT)\r
+Received: from mail-wg0-f51.google.com (mail-wg0-f51.google.com\r
+ [74.125.82.51])       (using TLSv1 with cipher RC4-SHA (128/128 bits))        (No client\r
+ certificate requested)        by olra.theworths.org (Postfix) with ESMTPS id\r
+ 09D9A40D1DE   for <notmuch@notmuchmail.org>; Sat,  7 Jun 2014 02:51:22 -0700\r
+ (PDT)\r
+Received: by mail-wg0-f51.google.com with SMTP id x12so1176633wgg.22\r
+       for <notmuch@notmuchmail.org>; Sat, 07 Jun 2014 02:51:20 -0700 (PDT)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
+       h=from:to:cc:subject:date:message-id;\r
+       bh=xH35iDnSwFF2+kuxNRC0svRFJPkFExufAhX2ns117h8=;\r
+       b=rxaVR/XCcGdvKOhx/nx216zleTfyl6ngNtqHimNlqSsHvMJbuNHFf8Dljclbkxoili\r
+       kHyVwJ3Rno01MYwKe9Tfbrwi6qmYi7K6OUJI9PEbe71OB2xsbCeRPb0a9D7p3wAToj16\r
+       nsP1r0V2tMqJzf+Q5WuQ20EHM5+nz52F1O89q5aoBoSgXTJQ1HbcBfSUGeN6uf8IRaM4\r
+       aHf5369t++FtifJLt2azYGXdaAYtscZnA5P/0yB2irRmxtIWXtpybwSX3nnClmJ9rR5H\r
+       U48M0KlKnvk/jQuhu9v4xFvSASiFOIgaggCB4+mm9pu+xbPydXmyAWjqS2NqX6fvrejX\r
+       Iscw==\r
+X-Received: by 10.180.38.38 with SMTP id d6mr12756650wik.12.1402134680650;\r
+       Sat, 07 Jun 2014 02:51:20 -0700 (PDT)\r
+Received: from localhost (5751dfa2.skybroadband.com. [87.81.223.162])\r
+       by mx.google.com with ESMTPSA id\r
+       ht5sm15762417wjb.49.2014.06.07.02.51.19 for <multiple recipients>\r
+       (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+       Sat, 07 Jun 2014 02:51:20 -0700 (PDT)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] emacs: tree/show remove duplicate function\r
+Date: Sat,  7 Jun 2014 10:51:08 +0100\r
+Message-Id: <1402134668-18587-1-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.10.4\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: Sat, 07 Jun 2014 09:51:29 -0000\r
+\r
+tree overrides notmuch-show-get-prop so that it can use many of the\r
+utility function directly. Now that tree is in mainline the version\r
+from tree can be moved to show and the original overridden show\r
+version dropped.\r
+---\r
+I should have done this ages ago but forgot about it.\r
+\r
+Best wishes\r
+\r
+Mark\r
+\r
+\r
+ emacs/notmuch-show.el |   12 +++++++++++-\r
+ emacs/notmuch-tree.el |   16 ----------------\r
+ 2 files changed, 11 insertions(+), 17 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el\r
+index 10fc872..b922a38 100644\r
+--- a/emacs/notmuch-show.el\r
++++ b/emacs/notmuch-show.el\r
+@@ -46,6 +46,7 @@\r
+ (declare-function notmuch-save-attachments "notmuch" (mm-handle &optional queryp))\r
+ (declare-function notmuch-tree "notmuch-tree"\r
+                 (&optional query query-context target buffer-name open-target))\r
++(declare-function notmuch-tree-get-message-properties "notmuch-tree" nil)\r
+ \r
+ (defcustom notmuch-message-headers '("Subject" "To" "Cc" "Date")\r
+   "Headers that should be shown in a message, in this order.\r
+@@ -1459,8 +1460,17 @@ (defun notmuch-show-set-prop (prop val &optional props)\r
+     (notmuch-show-set-message-properties props)))\r
+ \r
+ (defun notmuch-show-get-prop (prop &optional props)\r
++  "Get property PROP from current message in show or tree mode.\r
++\r
++It gets property PROP from PROPS or, if PROPS is nil, the current\r
++message in either tree or show. This means that several utility\r
++functions in notmuch-show can be used directly by notmuch-tree as\r
++they just need the correct message properties."\r
+   (let ((props (or props\r
+-                 (notmuch-show-get-message-properties))))\r
++                 (cond ((eq major-mode 'notmuch-show-mode)\r
++                        (notmuch-show-get-message-properties))\r
++                       ((eq major-mode 'notmuch-tree-mode)\r
++                        (notmuch-tree-get-message-properties))))))\r
+     (plist-get props prop)))\r
+ \r
+ (defun notmuch-show-get-message-id (&optional bare)\r
+diff --git a/emacs/notmuch-tree.el b/emacs/notmuch-tree.el\r
+index 7d5f475..88f92f2 100644\r
+--- a/emacs/notmuch-tree.el\r
++++ b/emacs/notmuch-tree.el\r
+@@ -290,22 +290,6 @@ (defun notmuch-tree-get-message-properties ()\r
+     (beginning-of-line)\r
+     (get-text-property (point) :notmuch-message-properties)))\r
+ \r
+-;; XXX This should really be a lib function but we are trying to\r
+-;; reduce impact on the code base.\r
+-(defun notmuch-show-get-prop (prop &optional props)\r
+-  "This is a tree view overridden version of notmuch-show-get-prop\r
+-\r
+-It gets property PROP from PROPS or, if PROPS is nil, the current\r
+-message in either tree or show. This means that several functions\r
+-in notmuch-show now work unchanged in tree as they just need the\r
+-correct message properties."\r
+-  (let ((props (or props\r
+-                 (cond ((eq major-mode 'notmuch-show-mode)\r
+-                        (notmuch-show-get-message-properties))\r
+-                       ((eq major-mode 'notmuch-tree-mode)\r
+-                        (notmuch-tree-get-message-properties))))))\r
+-    (plist-get props prop)))\r
+-\r
+ (defun notmuch-tree-set-message-properties (props)\r
+   (save-excursion\r
+     (beginning-of-line)\r
+-- \r
+1.7.10.4\r
+\r