[PATCH] emacs: escape % in header line format

diff --git a/7d/4a91b1bfe3b2fa3059e3600188b51a6198817d b/7d/4a91b1bfe3b2fa3059e3600188b51a6198817d
new file mode 100644 (file)
index 0000000..4571e87
--- /dev/null
+++ b/7d/4a91b1bfe3b2fa3059e3600188b51a6198817d
@@ -0,0 +1,81 @@
+Return-Path: <bremner@tesseract.cs.unb.ca>\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 236E8431FC9\r
+       for <notmuch@notmuchmail.org>; Thu, 22 Jan 2015 00:39:34 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 2.438\r
+X-Spam-Level: **\r
+X-Spam-Status: No, score=2.438 tagged_above=-999 required=5\r
+       tests=[DNS_FROM_AHBL_RHSBL=2.438] 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 66hHeuW44+18 for <notmuch@notmuchmail.org>;\r
+       Thu, 22 Jan 2015 00:39:31 -0800 (PST)\r
+Received: from mx.xen14.node3324.gplhost.com (gitolite.debian.net\r
+       [87.98.215.224])\r
+       (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 5664C431FBC\r
+       for <notmuch@notmuchmail.org>; Thu, 22 Jan 2015 00:39:31 -0800 (PST)\r
+Received: from remotemail by mx.xen14.node3324.gplhost.com with local (Exim\r
+       4.80) (envelope-from <bremner@tesseract.cs.unb.ca>)\r
+       id 1YEDGx-0006LM-VS; Thu, 22 Jan 2015 08:37:51 +0000\r
+Received: (nullmailer pid 14038 invoked by uid 1000); Thu, 22 Jan 2015\r
+       08:37:38 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: Jinwoo Lee <jinwoo68@gmail.com>, David Bremner <david@tethera.net>,\r
+       notmuch@notmuchmail.org\r
+Subject: [PATCH] emacs: escape % in header line format\r
+Date: Thu, 22 Jan 2015 09:37:32 +0100\r
+Message-Id: <1421915852-13963-1-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 2.1.4\r
+In-Reply-To: <yq657fwfcjt5.fsf@jinwoo-macbookair.roam.corp.google.com>\r
+References: <yq657fwfcjt5.fsf@jinwoo-macbookair.roam.corp.google.com>\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: Thu, 22 Jan 2015 08:39:34 -0000\r
+\r
+We set header-line-format to the message subject, but if the subject\r
+contains percents, the next character is interpreted as a formatting\r
+control, which is not desired.\r
+---\r
+\r
+You're correct of course. I have no idea how my testing convinced me\r
+the previous version worked.\r
+\r
+emacs/notmuch-show.el | 6 +++++-\r
+ 1 file changed, 5 insertions(+), 1 deletion(-)\r
+\r
+diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el\r
+index 9f6fe07..87b4881 100644\r
+--- a/emacs/notmuch-show.el\r
++++ b/emacs/notmuch-show.el\r
+@@ -1198,7 +1198,11 @@ function is used."\r
+       (notmuch-show-mapc (lambda () (notmuch-show-set-prop :orig-tags (notmuch-show-get-tags))))\r
+ \r
+       ;; Set the header line to the subject of the first message.\r
+-      (setq header-line-format (notmuch-sanitize (notmuch-show-strip-re (notmuch-show-get-subject))))\r
++      (setq header-line-format\r
++          (replace-regexp-in-string "%" "%%"\r
++                          (notmuch-sanitize\r
++                           (notmuch-show-strip-re\r
++                            (notmuch-show-get-subject)))))\r
+ \r
+       (run-hooks 'notmuch-show-hook))))\r
+ \r
+-- \r
+2.1.4\r
+\r