[PATCH 1/2] emacs: Add notmuch-combine-face-text-property-string

diff --git a/66/4336b01d7ed3f73d8fb189a168d186e6351dce b/66/4336b01d7ed3f73d8fb189a168d186e6351dce
new file mode 100644 (file)
index 0000000..be80e36
--- /dev/null
+++ b/66/4336b01d7ed3f73d8fb189a168d186e6351dce
@@ -0,0 +1,89 @@
+Return-Path: <damien.cassou@gmail.com>\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 2D2D6431FBF\r
+       for <notmuch@notmuchmail.org>; Sat, 23 Mar 2013 04:30:11 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.799\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5\r
+       tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+       FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] 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 etn3ACtJVB7G for <notmuch@notmuchmail.org>;\r
+       Sat, 23 Mar 2013 04:30:09 -0700 (PDT)\r
+Received: from mail-wi0-f179.google.com (mail-wi0-f179.google.com\r
+       [209.85.212.179]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 3A519431FAF\r
+       for <notmuch@notmuchmail.org>; Sat, 23 Mar 2013 04:30:09 -0700 (PDT)\r
+Received: by mail-wi0-f179.google.com with SMTP id hn17so2555127wib.6\r
+       for <notmuch@notmuchmail.org>; Sat, 23 Mar 2013 04:30:08 -0700 (PDT)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
+       h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to\r
+       :references; bh=4KCc29b/xLak5fZjYXVU7uiG/2BdnmhRnCO6/HgfOL8=;\r
+       b=PpYubPtLu67URTnudvch63eE1sMOfQhTfEkcupyIL9pRKrEc/Enlzyk7BZMcBYYvGj\r
+       GWXnIm9qhm1XOOdQ5f5Is5MHH3p3442Ut9Fgjr+xiGz/QvHAVmf8+/GkbPuNXgs/q7vY\r
+       clw20aDN4td8qnm2jNzEccVOSgf4W0SR0ROlvNHaUfWoAElhC34G7Cqcq/mwbgt+4Pg5\r
+       WY31+cikJjSfLy7YyFtggZpANF/sIga7I/yrW0OxnZ2kFo8oid8tdQa1SzPc42QjU/dj\r
+       kqETtG87QhLFUAr0WBucxNHT5/SwmNdONk/lUIPr9mM7vlsJWLl3RDoQn3ZTI2uRpmWE\r
+       4/pQ==\r
+X-Received: by 10.194.119.33 with SMTP id kr1mr8219948wjb.36.1364038208143;\r
+       Sat, 23 Mar 2013 04:30:08 -0700 (PDT)\r
+Received: from localhost.localdomain (110.195.67.86.rev.sfr.net.\r
+       [86.67.195.110])\r
+       by mx.google.com with ESMTPS id dp5sm16185652wib.1.2013.03.23.04.30.06\r
+       (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128);\r
+       Sat, 23 Mar 2013 04:30:07 -0700 (PDT)\r
+From: Damien Cassou <damien.cassou@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 1/2] emacs: Add notmuch-combine-face-text-property-string\r
+Date: Sat, 23 Mar 2013 12:29:53 +0100\r
+Message-Id: <1364038194-19856-2-git-send-email-damien.cassou@gmail.com>\r
+X-Mailer: git-send-email 1.7.10.4\r
+In-Reply-To: <1364038194-19856-1-git-send-email-damien.cassou@gmail.com>\r
+References: <1364038194-19856-1-git-send-email-damien.cassou@gmail.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: Sat, 23 Mar 2013 11:30:11 -0000\r
+\r
+Signed-off-by: Damien Cassou <damien.cassou@gmail.com>\r
+---\r
+ emacs/notmuch-lib.el |    8 ++++++++\r
+ 1 file changed, 8 insertions(+)\r
+\r
+diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el\r
+index e6edb9a..78c578f 100644\r
+--- a/emacs/notmuch-lib.el\r
++++ b/emacs/notmuch-lib.el\r
+@@ -357,6 +357,14 @@ OBJECT."\r
+       (setq pos next))))\r
+   object)\r
+ \r
++(defun notmuch-combine-face-text-property-string (string face &optional below)\r
++  (notmuch-combine-face-text-property\r
++   0\r
++   (length string)\r
++   face\r
++   below\r
++   string))\r
++\r
+ (defun notmuch-logged-error (msg &optional extra)\r
+   "Log MSG and EXTRA to *Notmuch errors* and signal MSG.\r
+ \r
+-- \r
+1.7.10.4\r
+\r