Re: [PATCH] contrib: pick: archive message updated

diff --git a/74/73df146bb7bba9ae55f3469222a39006ba69cb b/74/73df146bb7bba9ae55f3469222a39006ba69cb
new file mode 100644 (file)
index 0000000..095ee44
--- /dev/null
+++ b/74/73df146bb7bba9ae55f3469222a39006ba69cb
@@ -0,0 +1,121 @@
+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 26249431FBC\r
+       for <notmuch@notmuchmail.org>; Sat, 15 Dec 2012 06:34:38 -0800 (PST)\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 JUGnbZSmTA4N for <notmuch@notmuchmail.org>;\r
+       Sat, 15 Dec 2012 06:34:37 -0800 (PST)\r
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
+       by olra.theworths.org (Postfix) with ESMTP id E626F431FB6\r
+       for <notmuch@notmuchmail.org>; Sat, 15 Dec 2012 06:34:36 -0800 (PST)\r
+Received: from guru.guru-group.fi (localhost [IPv6:::1])\r
+       by guru.guru-group.fi (Postfix) with ESMTP id CE39410007E;\r
+       Sat, 15 Dec 2012 16:34:31 +0200 (EET)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: Mark Walters <markwalters1009@gmail.com>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH] contrib: pick: archive message updated\r
+In-Reply-To: <1354970494-18050-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1354970494-18050-1-git-send-email-markwalters1009@gmail.com>\r
+User-Agent: Notmuch/0.14+116~g29fcdb5 (http://notmuchmail.org) Emacs/24.2.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, 15 Dec 2012 16:34:31 +0200\r
+Message-ID: <m2txrnpeo8.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, 15 Dec 2012 14:34:39 -0000\r
+\r
+On Sat, Dec 08 2012, Mark Walters <markwalters1009@gmail.com> wrote:\r
+\r
+> Update pick's archive message to respect notmuch-archive-tags. Also\r
+> split archive message into an archiving part and a separate\r
+> "then-next" part, to move more inline with show. Update the keybinding\r
+> so default behaviour is unchanged.\r
+> ---\r
+\r
+LGTM.\r
+\r
+Tomi\r
+\r
+\r
+>\r
+> Notmuch pick had fallen behind show so update.\r
+>\r
+> Best wishes \r
+>\r
+> Mark\r
+>\r
+>\r
+>  contrib/notmuch-pick/notmuch-pick.el |   21 +++++++++++++++++----\r
+>  1 files changed, 17 insertions(+), 4 deletions(-)\r
+>\r
+> diff --git a/contrib/notmuch-pick/notmuch-pick.el b/contrib/notmuch-pick/notmuch-pick.el\r
+> index 755cbbc..36587a6 100644\r
+> --- a/contrib/notmuch-pick/notmuch-pick.el\r
+> +++ b/contrib/notmuch-pick/notmuch-pick.el\r
+> @@ -173,7 +173,7 @@\r
+>      (define-key map "q" 'notmuch-pick-quit)\r
+>      (define-key map "x" 'notmuch-pick-quit)\r
+>      (define-key map "?" 'notmuch-help)\r
+> -    (define-key map "a" 'notmuch-pick-archive-message)\r
+> +    (define-key map "a" 'notmuch-pick-archive-message-then-next)\r
+>      (define-key map "=" 'notmuch-pick-refresh-view)\r
+>      (define-key map "s" 'notmuch-search)\r
+>      (define-key map "z" 'notmuch-pick)\r
+> @@ -393,10 +393,23 @@ Does NOT change the database."\r
+>        (kill-buffer notmuch-pick-message-buffer))\r
+>      t))\r
+>  \r
+> -(defun notmuch-pick-archive-message ()\r
+> +(defun notmuch-pick-archive-message (&optional unarchive)\r
+> +  "Archive the current message.\r
+> +\r
+> +Archive the current message by applying the tag changes in\r
+> +`notmuch-archive-tags' to it (remove the \"inbox\" tag by\r
+> +default). If a prefix argument is given, the message will be\r
+> +\"unarchived\", i.e. the tag changes in `notmuch-archive-tags'\r
+> +will be reversed."\r
+> +  (interactive "P")\r
+> +  (when notmuch-archive-tags\r
+> +    (apply 'notmuch-pick-tag\r
+> +       (notmuch-tag-change-list notmuch-archive-tags unarchive))))\r
+> +\r
+> +(defun notmuch-pick-archive-message-then-next (&optional unarchive)\r
+>    "Archive the current message and move to next matching message."\r
+> -  (interactive)\r
+> -  (notmuch-pick-tag "-inbox")\r
+> +  (interactive "P")\r
+> +  (notmuch-pick-archive-message unarchive)\r
+>    (notmuch-pick-next-matching-message))\r
+>  \r
+>  (defun notmuch-pick-next-message ()\r
+> -- \r
+> 1.7.9.1\r
+>\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r