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