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