Re: [PATCH] emacs: Fix trimming regexp in notmuch-check-exit-status

diff --git a/7f/a0d5514268bf4ec12b257f279f401777ef0ddc b/7f/a0d5514268bf4ec12b257f279f401777ef0ddc
new file mode 100644 (file)
index 0000000..4eb3c52
--- /dev/null
+++ b/7f/a0d5514268bf4ec12b257f279f401777ef0ddc
@@ -0,0 +1,104 @@
+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 EFE07431FC9\r
+       for <notmuch@notmuchmail.org>; Sat, 18 May 2013 06:45:41 -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 xNRq5UVkHoJL for <notmuch@notmuchmail.org>;\r
+       Sat, 18 May 2013 06:45:37 -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 90271431FC2\r
+       for <notmuch@notmuchmail.org>; Sat, 18 May 2013 06:45:37 -0700 (PDT)\r
+Received: from guru.guru-group.fi (localhost [IPv6:::1])\r
+       by guru.guru-group.fi (Postfix) with ESMTP id 4D954100094;\r
+       Sat, 18 May 2013 16:45:31 +0300 (EEST)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: Austin Clements <amdragon@MIT.EDU>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH] emacs: Fix trimming regexp in notmuch-check-exit-status\r
+In-Reply-To: <1368821643-24179-1-git-send-email-amdragon@mit.edu>\r
+References: <1368821643-24179-1-git-send-email-amdragon@mit.edu>\r
+User-Agent: Notmuch/0.15.2+99~g7e455bc (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, 18 May 2013 16:45:30 +0300\r
+Message-ID: <m2ip2gjtad.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, 18 May 2013 13:45:42 -0000\r
+\r
+On Fri, May 17 2013, Austin Clements <amdragon@MIT.EDU> wrote:\r
+\r
+> For such a simple regexp, this was broken in a very complicated way.\r
+>\r
+> The intent was to strip the newline (and potentially other whitespace)\r
+> off the end of the error string so there wasn't an extra newline in\r
+> the error signal.  However, the regexp was deeply dependent on the\r
+> active syntax table and the subtleties of $.  We didn't notice this\r
+> because all notmuch major modes put ?\n in the whitespace class, which\r
+> makes this behaved as intended: the "\\s " matches all newlines, but\r
+> by matching the newline character, causes the $ *not* to match\r
+> *except* where it matched the empty string at the very end of the\r
+> string, which was not followed by a newline.\r
+>\r
+> However, if the syntax table declares ?\n to be non-whitespace\r
+> (lisp-mode declares it as endcomment, and is likely to be the mode\r
+> you're in when testing functions), then this regexp behaves completely\r
+> differently, matching trailing spaces at the end of every line within\r
+> the string.\r
+>\r
+> The solution is to say what we mean for whitespace *and* to switch\r
+> from $ to \', which matches only the end of the string, rather than\r
+> the end of each line.  Both are necessary or this will strip away\r
+> interior newlines, which is not what we want.\r
+\r
+LGTM.\r
+\r
+Tomi\r
+\r
+\r
+> ---\r
+>  emacs/notmuch-lib.el |    2 +-\r
+>  1 file changed, 1 insertion(+), 1 deletion(-)\r
+>\r
+> diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el\r
+> index 790136e..59b1ce3 100644\r
+> --- a/emacs/notmuch-lib.el\r
+> +++ b/emacs/notmuch-lib.el\r
+> @@ -438,7 +438,7 @@ You may need to restart Emacs or upgrade your notmuch package."))\r
+>      (if err\r
+>          ;; We have an error message straight from the CLI.\r
+>          (notmuch-logged-error\r
+> -         (replace-regexp-in-string "\\s $" "" err) extra)\r
+> +         (replace-regexp-in-string "[ \n\r\t\f]*\\'" "" err) extra)\r
+>        ;; We only have combined output from the CLI; don't inundate\r
+>        ;; the user with it.  Mimic `process-lines'.\r
+>        (notmuch-logged-error (format "%s exited with status %s"\r
+> -- \r
+> 1.7.10.4\r
+>\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r