Re: [PATCH] contrib: pick: unset current-prefix-arg for notmuch-show

diff --git a/56/4cb5f78536cc287e6f0352fe4865f84ed949bc b/56/4cb5f78536cc287e6f0352fe4865f84ed949bc
new file mode 100644 (file)
index 0000000..744cf1c
--- /dev/null
+++ b/56/4cb5f78536cc287e6f0352fe4865f84ed949bc
@@ -0,0 +1,134 @@
+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 2F5D9431FD7\r
+       for <notmuch@notmuchmail.org>; Wed,  2 Oct 2013 09:58:17 -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 8kFKvMktty5M for <notmuch@notmuchmail.org>;\r
+       Wed,  2 Oct 2013 09:58:08 -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 CDA0F431FD6\r
+       for <notmuch@notmuchmail.org>; Wed,  2 Oct 2013 09:58:07 -0700 (PDT)\r
+Received: from guru.guru-group.fi (localhost [IPv6:::1])\r
+       by guru.guru-group.fi (Postfix) with ESMTP id 0B315100033;\r
+       Wed,  2 Oct 2013 19:57:52 +0300 (EEST)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: Mark Walters <markwalters1009@gmail.com>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH] contrib: pick: unset current-prefix-arg for notmuch-show\r
+In-Reply-To: <1380718788-18165-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1380718788-18165-1-git-send-email-markwalters1009@gmail.com>\r
+User-Agent: Notmuch/0.16+87~g451fefe (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: Wed, 02 Oct 2013 19:57:51 +0300\r
+Message-ID: <m2siwjhapc.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: Wed, 02 Oct 2013 16:58:17 -0000\r
+\r
+On Wed, Oct 02 2013, Mark Walters <markwalters1009@gmail.com> wrote:\r
+\r
+> notmuch-show looks at the prefix argument directly (ie via\r
+> current-prefix-arg) rather than using some form of the interactive\r
+> command. Thus we need to unset current-prefix-arg before calling notmuch-show.\r
+> ---\r
+\r
+Alternatively fix notmuch-show to do\r
+\r
+(interactive "sNotmuch show: \nP")\r
+\r
+and then add new argument, like `elide-toggle` or something to the\r
+function.\r
+\r
+Not considering notmuch-pick there is only one (1) call to that function,\r
+inside notmuch sources... soo the change there would be.\r
+\r
+--- a/emacs/notmuch.el\r
++++ b/emacs/notmuch.el\r
+@@ -495 +495 @@ If BARE is set then do not prefix with \"thread:\""\r
+-       (notmuch-show thread-id\r
++       (notmuch-show thread-id nil\r
+\r
+IMO there should not be "current-prefix-arg" side effects when calling \r
+notmuch-show non-interactively, yet other opinions welcome.\r
+\r
+\r
+Tomi\r
+\r
+\r
+> I was just doing final tests for pick to mainline when I discovered\r
+> the following bug. The show-out option was not working quite correctly\r
+> (it was eliding the non-matching messages). I traced this to the\r
+> following: notmuch-show looks at current-prefix-arg directly. The\r
+> recent change to call notmuch-pick-show-message-out via a prefix arg\r
+> rather than its own keybinding meant that this prefix arg is being\r
+> passed on to the subsidary notmuch-show call. \r
+>\r
+> To avoid this we unset current-prefix-arg before calling\r
+> notmuch-show. It seems neatest to do this in\r
+> notmuch-pick-show-message.\r
+>\r
+> Sorry for not spotting this before.\r
+>\r
+> Best wishes\r
+>\r
+> Mark\r
+>\r
+>\r
+>\r
+>\r
+>\r
+>  contrib/notmuch-pick/notmuch-pick.el |   11 +++++++----\r
+>  1 files changed, 7 insertions(+), 4 deletions(-)\r
+>\r
+> diff --git a/contrib/notmuch-pick/notmuch-pick.el b/contrib/notmuch-pick/notmuch-pick.el\r
+> index 0aa651e..6b727b2 100644\r
+> --- a/contrib/notmuch-pick/notmuch-pick.el\r
+> +++ b/contrib/notmuch-pick/notmuch-pick.el\r
+> @@ -488,10 +488,13 @@ Does NOT change the database."\r
+>  Shows in split pane or whole window according to value of\r
+>  `notmuch-pick-show-out'. A prefix argument reverses the choice."\r
+>    (interactive "P")\r
+> -  (if (or (and notmuch-pick-show-out  (not arg))\r
+> -      (and (not notmuch-pick-show-out) arg))\r
+> -      (notmuch-pick-show-message-out)\r
+> -    (notmuch-pick-show-message-in)))\r
+> +  ;; We have to unset current-prefix-arg as notmuch-show examines it\r
+> +  ;; directly.\r
+> +  (let ((current-prefix-arg nil))\r
+> +    (if (or (and notmuch-pick-show-out (not arg))\r
+> +        (and (not notmuch-pick-show-out) arg))\r
+> +    (notmuch-pick-show-message-out)\r
+> +      (notmuch-pick-show-message-in))))\r
+>  \r
+>  (defun notmuch-pick-scroll-message-window ()\r
+>    "Scroll the message window (if it exists)"\r
+> -- \r
+> 1.7.9.1\r
+>\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r