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

diff --git a/cc/a48d388a5320babfdc5a2617f3111d7a167afc b/cc/a48d388a5320babfdc5a2617f3111d7a167afc
new file mode 100644 (file)
index 0000000..425b5f5
--- /dev/null
+++ b/cc/a48d388a5320babfdc5a2617f3111d7a167afc
@@ -0,0 +1,88 @@
+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 70981431FBD\r
+       for <notmuch@notmuchmail.org>; Wed,  6 Feb 2013 06:54:08 -0800 (PST)\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 tH3g1gYcsORJ for <notmuch@notmuchmail.org>;\r
+       Wed,  6 Feb 2013 06:54:06 -0800 (PST)\r
+Received: from mail-wi0-f180.google.com (mail-wi0-f180.google.com\r
+       [209.85.212.180]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 2E2D5431FB6\r
+       for <notmuch@notmuchmail.org>; Wed,  6 Feb 2013 06:54:06 -0800 (PST)\r
+Received: by mail-wi0-f180.google.com with SMTP id hi8so1654954wib.7\r
+       for <notmuch@notmuchmail.org>; Wed, 06 Feb 2013 06:54:05 -0800 (PST)\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=if89jPioFswJRI84BNrcv8J31h6RV9Pjd6uoYN+JAzM=;\r
+       b=mjuADFBLc6ieBbhUpImJmtdMEO7TPtWl1BNwLr0gnygcLF16poumNNjJbLhqjq9P4O\r
+       h5+9n9/smbvRVaRVi5+wN05qBvE9zd+ORDCBEEykD35/HeGInVz4tnKG5sgbWoiKsxPs\r
+       bl+Hu2O0qgfXe7Es7ebZW4Fgj+A/KAEdYg9VAjT38HaiCKUs1scIF6iGIDPOTKyjzBWM\r
+       G83mKSSjKUl1AnizhrxvflTN+jhuYxpdc4LSJ6V3nvjY7vSyhW/b2vkMPE1l9MBw48Z/\r
+       RBSgFDCifkQcRtulAJW6hIshOGuuM/8YEBojv6GEszylhwGQXj3K81/770PQtDna/GMw\r
+       ZHyw==\r
+X-Received: by 10.180.97.102 with SMTP id dz6mr5544680wib.3.1360162445081;\r
+       Wed, 06 Feb 2013 06:54:05 -0800 (PST)\r
+Received: from luz3.lille.inria.fr ([193.51.236.44])\r
+       by mx.google.com with ESMTPS id df2sm3441008wib.0.2013.02.06.06.54.03\r
+       (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128);\r
+       Wed, 06 Feb 2013 06:54:04 -0800 (PST)\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: Wed,  6 Feb 2013 15:53:54 +0100\r
+Message-Id: <1360162435-29506-2-git-send-email-damien.cassou@gmail.com>\r
+X-Mailer: git-send-email 1.7.10.4\r
+In-Reply-To: <1360162435-29506-1-git-send-email-damien.cassou@gmail.com>\r
+References: <1360162435-29506-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: Wed, 06 Feb 2013 14:54:08 -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 307133b..7e83371 100644\r
+--- a/emacs/notmuch-lib.el\r
++++ b/emacs/notmuch-lib.el\r
+@@ -342,6 +342,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