Re: [PATCH] emacs: tree/show remove duplicate function

diff --git a/f8/0c41f16c29b49dbfd16074accd0633ad6442c7 b/f8/0c41f16c29b49dbfd16074accd0633ad6442c7
new file mode 100644 (file)
index 0000000..7039661
--- /dev/null
+++ b/f8/0c41f16c29b49dbfd16074accd0633ad6442c7
@@ -0,0 +1,144 @@
+Return-Path: <tomi.ollila@iki.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 208B240A92F\r
+       for <notmuch@notmuchmail.org>; Sat,  7 Jun 2014 06:43:03 -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 O06gPyUvXLzB for <notmuch@notmuchmail.org>;\r
+       Sat,  7 Jun 2014 06:42:54 -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 92F1640A92E\r
+       for <notmuch@notmuchmail.org>; Sat,  7 Jun 2014 06:42:54 -0700 (PDT)\r
+Received: from guru.guru-group.fi (localhost [IPv6:::1])\r
+       by guru.guru-group.fi (Postfix) with ESMTP id 3C3611000B3;\r
+       Sat,  7 Jun 2014 16:42:46 +0300 (EEST)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: Mark Walters <markwalters1009@gmail.com>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH] emacs: tree/show remove duplicate function\r
+In-Reply-To: <1402134668-18587-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1402134668-18587-1-git-send-email-markwalters1009@gmail.com>\r
+User-Agent: Notmuch/0.18+28~gcecaba1 (http://notmuchmail.org) Emacs/24.3.1\r
+       (x86_64-unknown-linux-gnu)\r
+X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL\r
+       $[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F\r
+       !)g;OY^,BjTbr)Np:%c_o'jj,Z\r
+Date: Sat, 07 Jun 2014 16:42:46 +0300\r
+Message-ID: <m2a99on8dl.fsf@guru.guru-group.fi>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\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 13:43:03 -0000\r
+\r
+On Sat, Jun 07 2014, Mark Walters <markwalters1009@gmail.com> wrote:\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
+LGTM, and \r
+\r
+https://github.com/domo141/nottoomuch/blob/master/make-one-notmuch-el.pl\r
+\r
+no longer complains about duplicate function :D\r
+\r
+>\r
+> Best wishes\r
+>\r
+> Mark\r
+\r
+Tomi\r
+\r
+\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
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r