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 2D2D6431FBF
\r
6 for <notmuch@notmuchmail.org>; Sat, 23 Mar 2013 04:30:11 -0700 (PDT)
\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 etn3ACtJVB7G for <notmuch@notmuchmail.org>;
\r
17 Sat, 23 Mar 2013 04:30:09 -0700 (PDT)
\r
18 Received: from mail-wi0-f179.google.com (mail-wi0-f179.google.com
\r
19 [209.85.212.179]) (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 3A519431FAF
\r
22 for <notmuch@notmuchmail.org>; Sat, 23 Mar 2013 04:30:09 -0700 (PDT)
\r
23 Received: by mail-wi0-f179.google.com with SMTP id hn17so2555127wib.6
\r
24 for <notmuch@notmuchmail.org>; Sat, 23 Mar 2013 04:30:08 -0700 (PDT)
\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=4KCc29b/xLak5fZjYXVU7uiG/2BdnmhRnCO6/HgfOL8=;
\r
28 b=PpYubPtLu67URTnudvch63eE1sMOfQhTfEkcupyIL9pRKrEc/Enlzyk7BZMcBYYvGj
\r
29 GWXnIm9qhm1XOOdQ5f5Is5MHH3p3442Ut9Fgjr+xiGz/QvHAVmf8+/GkbPuNXgs/q7vY
\r
30 clw20aDN4td8qnm2jNzEccVOSgf4W0SR0ROlvNHaUfWoAElhC34G7Cqcq/mwbgt+4Pg5
\r
31 WY31+cikJjSfLy7YyFtggZpANF/sIga7I/yrW0OxnZ2kFo8oid8tdQa1SzPc42QjU/dj
\r
32 kqETtG87QhLFUAr0WBucxNHT5/SwmNdONk/lUIPr9mM7vlsJWLl3RDoQn3ZTI2uRpmWE
\r
34 X-Received: by 10.194.119.33 with SMTP id kr1mr8219948wjb.36.1364038208143;
\r
35 Sat, 23 Mar 2013 04:30:08 -0700 (PDT)
\r
36 Received: from localhost.localdomain (110.195.67.86.rev.sfr.net.
\r
38 by mx.google.com with ESMTPS id dp5sm16185652wib.1.2013.03.23.04.30.06
\r
39 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128);
\r
40 Sat, 23 Mar 2013 04:30:07 -0700 (PDT)
\r
41 From: Damien Cassou <damien.cassou@gmail.com>
\r
42 To: notmuch@notmuchmail.org
\r
43 Subject: [PATCH 1/2] emacs: Add notmuch-combine-face-text-property-string
\r
44 Date: Sat, 23 Mar 2013 12:29:53 +0100
\r
45 Message-Id: <1364038194-19856-2-git-send-email-damien.cassou@gmail.com>
\r
46 X-Mailer: git-send-email 1.7.10.4
\r
47 In-Reply-To: <1364038194-19856-1-git-send-email-damien.cassou@gmail.com>
\r
48 References: <1364038194-19856-1-git-send-email-damien.cassou@gmail.com>
\r
49 X-BeenThere: notmuch@notmuchmail.org
\r
50 X-Mailman-Version: 2.1.13
\r
52 List-Id: "Use and development of the notmuch mail system."
\r
53 <notmuch.notmuchmail.org>
\r
54 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
55 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
56 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
57 List-Post: <mailto:notmuch@notmuchmail.org>
\r
58 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
59 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
60 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
61 X-List-Received-Date: Sat, 23 Mar 2013 11:30:11 -0000
\r
63 Signed-off-by: Damien Cassou <damien.cassou@gmail.com>
\r
65 emacs/notmuch-lib.el | 8 ++++++++
\r
66 1 file changed, 8 insertions(+)
\r
68 diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el
\r
69 index e6edb9a..78c578f 100644
\r
70 --- a/emacs/notmuch-lib.el
\r
71 +++ b/emacs/notmuch-lib.el
\r
72 @@ -357,6 +357,14 @@ OBJECT."
\r
76 +(defun notmuch-combine-face-text-property-string (string face &optional below)
\r
77 + (notmuch-combine-face-text-property
\r
84 (defun notmuch-logged-error (msg &optional extra)
\r
85 "Log MSG and EXTRA to *Notmuch errors* and signal MSG.
\r