1 Return-Path: <damien.cassou@gmail.com>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id 70981431FBD
\r
6 for <notmuch@notmuchmail.org>; Wed, 6 Feb 2013 06:54:08 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5
\r
12 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,
\r
13 FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled
\r
14 Received: from olra.theworths.org ([127.0.0.1])
\r
15 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
16 with ESMTP id tH3g1gYcsORJ for <notmuch@notmuchmail.org>;
\r
17 Wed, 6 Feb 2013 06:54:06 -0800 (PST)
\r
18 Received: from mail-wi0-f180.google.com (mail-wi0-f180.google.com
\r
19 [209.85.212.180]) (using TLSv1 with cipher RC4-SHA (128/128 bits))
\r
20 (No client certificate requested)
\r
21 by olra.theworths.org (Postfix) with ESMTPS id 2E2D5431FB6
\r
22 for <notmuch@notmuchmail.org>; Wed, 6 Feb 2013 06:54:06 -0800 (PST)
\r
23 Received: by mail-wi0-f180.google.com with SMTP id hi8so1654954wib.7
\r
24 for <notmuch@notmuchmail.org>; Wed, 06 Feb 2013 06:54:05 -0800 (PST)
\r
25 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
\r
26 h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to
\r
27 :references; bh=if89jPioFswJRI84BNrcv8J31h6RV9Pjd6uoYN+JAzM=;
\r
28 b=mjuADFBLc6ieBbhUpImJmtdMEO7TPtWl1BNwLr0gnygcLF16poumNNjJbLhqjq9P4O
\r
29 h5+9n9/smbvRVaRVi5+wN05qBvE9zd+ORDCBEEykD35/HeGInVz4tnKG5sgbWoiKsxPs
\r
30 bl+Hu2O0qgfXe7Es7ebZW4Fgj+A/KAEdYg9VAjT38HaiCKUs1scIF6iGIDPOTKyjzBWM
\r
31 G83mKSSjKUl1AnizhrxvflTN+jhuYxpdc4LSJ6V3nvjY7vSyhW/b2vkMPE1l9MBw48Z/
\r
32 RBSgFDCifkQcRtulAJW6hIshOGuuM/8YEBojv6GEszylhwGQXj3K81/770PQtDna/GMw
\r
34 X-Received: by 10.180.97.102 with SMTP id dz6mr5544680wib.3.1360162445081;
\r
35 Wed, 06 Feb 2013 06:54:05 -0800 (PST)
\r
36 Received: from luz3.lille.inria.fr ([193.51.236.44])
\r
37 by mx.google.com with ESMTPS id df2sm3441008wib.0.2013.02.06.06.54.03
\r
38 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128);
\r
39 Wed, 06 Feb 2013 06:54:04 -0800 (PST)
\r
40 From: Damien Cassou <damien.cassou@gmail.com>
\r
41 To: notmuch@notmuchmail.org
\r
42 Subject: [PATCH 1/2] emacs: Add notmuch-combine-face-text-property-string
\r
43 Date: Wed, 6 Feb 2013 15:53:54 +0100
\r
44 Message-Id: <1360162435-29506-2-git-send-email-damien.cassou@gmail.com>
\r
45 X-Mailer: git-send-email 1.7.10.4
\r
46 In-Reply-To: <1360162435-29506-1-git-send-email-damien.cassou@gmail.com>
\r
47 References: <1360162435-29506-1-git-send-email-damien.cassou@gmail.com>
\r
48 X-BeenThere: notmuch@notmuchmail.org
\r
49 X-Mailman-Version: 2.1.13
\r
51 List-Id: "Use and development of the notmuch mail system."
\r
52 <notmuch.notmuchmail.org>
\r
53 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
54 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
55 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
56 List-Post: <mailto:notmuch@notmuchmail.org>
\r
57 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
58 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
59 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
60 X-List-Received-Date: Wed, 06 Feb 2013 14:54:08 -0000
\r
62 Signed-off-by: Damien Cassou <damien.cassou@gmail.com>
\r
64 emacs/notmuch-lib.el | 8 ++++++++
\r
65 1 file changed, 8 insertions(+)
\r
67 diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el
\r
68 index 307133b..7e83371 100644
\r
69 --- a/emacs/notmuch-lib.el
\r
70 +++ b/emacs/notmuch-lib.el
\r
71 @@ -342,6 +342,14 @@ OBJECT."
\r
75 +(defun notmuch-combine-face-text-property-string (string face &optional below)
\r
76 + (notmuch-combine-face-text-property
\r
83 (defun notmuch-logged-error (msg &optional extra)
\r
84 "Log MSG and EXTRA to *Notmuch errors* and signal MSG.
\r