1 Return-Path: <jani@nikula.org>
\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 391B3429E29
\r
6 for <notmuch@notmuchmail.org>; Tue, 20 Dec 2011 11:53:30 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
8 X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References"
\r
12 X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5
\r
13 tests=[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 5ZZmaXRdb3xu for <notmuch@notmuchmail.org>;
\r
17 Tue, 20 Dec 2011 11:53:29 -0800 (PST)
\r
18 Received: from mail-ee0-f53.google.com (mail-ee0-f53.google.com
\r
19 [74.125.83.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client
\r
20 certificate requested) by olra.theworths.org (Postfix) with ESMTPS id
\r
21 95D56431FD0 for <notmuch@notmuchmail.org>; Tue, 20 Dec 2011 11:53:27 -0800
\r
23 Received: by mail-ee0-f53.google.com with SMTP id d41so8138952eek.26
\r
24 for <notmuch@notmuchmail.org>; Tue, 20 Dec 2011 11:53:27 -0800 (PST)
\r
25 Received: by 10.14.50.202 with SMTP id z50mr1528222eeb.73.1324410807169;
\r
26 Tue, 20 Dec 2011 11:53:27 -0800 (PST)
\r
27 Received: from localhost (dsl-hkibrasgw4-fe5cdc00-23.dhcp.inet.fi.
\r
29 by mx.google.com with ESMTPS id j20sm10807763eej.8.2011.12.20.11.53.25
\r
30 (version=SSLv3 cipher=OTHER); Tue, 20 Dec 2011 11:53:25 -0800 (PST)
\r
31 From: Jani Nikula <jani@nikula.org>
\r
32 To: notmuch@notmuchmail.org
\r
33 Subject: [PATCH v2 2/2] emacs: Fix notmuch-mua-user-agent defcustom
\r
34 Date: Tue, 20 Dec 2011 21:53:14 +0200
\r
36 <f57278c429382294021bd5e6959886a5e44af594.1324410479.git.jani@nikula.org>
\r
37 X-Mailer: git-send-email 1.7.5.4
\r
38 In-Reply-To: <cover.1324410479.git.jani@nikula.org>
\r
40 <864e58d004c991bcb823e0f61f33eb8cbbbb5b76.1316804530.git.jani@nikula.org>
\r
41 <cover.1324410479.git.jani@nikula.org>
\r
42 In-Reply-To: <cover.1324410479.git.jani@nikula.org>
\r
43 References: <cover.1324410479.git.jani@nikula.org>
\r
44 X-BeenThere: notmuch@notmuchmail.org
\r
45 X-Mailman-Version: 2.1.13
\r
47 List-Id: "Use and development of the notmuch mail system."
\r
48 <notmuch.notmuchmail.org>
\r
49 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
50 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
51 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
52 List-Post: <mailto:notmuch@notmuchmail.org>
\r
53 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
54 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
55 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
56 X-List-Received-Date: Tue, 20 Dec 2011 19:53:30 -0000
\r
58 The :options keyword is not meaningful for function type. Also, it was not
\r
59 possible to enter nil value, contrary to the notmuch-mua-user-agent
\r
60 defcustom documentation. Specify the alternatives using choice type, taking
\r
63 Signed-off-by: Jani Nikula <jani@nikula.org>
\r
65 emacs/notmuch-mua.el | 10 ++++++----
\r
66 1 files changed, 6 insertions(+), 4 deletions(-)
\r
68 diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el
\r
69 index b525762..7114e48 100644
\r
70 --- a/emacs/notmuch-mua.el
\r
71 +++ b/emacs/notmuch-mua.el
\r
73 "Function used to generate a `User-Agent:' string. If this is
\r
74 `nil' then no `User-Agent:' will be generated."
\r
77 - :options '(notmuch-mua-user-agent-full
\r
78 - notmuch-mua-user-agent-notmuch
\r
79 - notmuch-mua-user-agent-emacs))
\r
80 + :type '(choice (const :tag "No user agent string" nil)
\r
81 + (const :tag "Full" notmuch-mua-user-agent-full)
\r
82 + (const :tag "Notmuch" notmuch-mua-user-agent-notmuch)
\r
83 + (const :tag "Emacs" notmuch-mua-user-agent-emacs)
\r
84 + (function :tag "Custom user agent function"
\r
85 + :value notmuch-mua-user-agent-full)))
\r
87 (defcustom notmuch-mua-hidden-headers '("^User-Agent:")
\r
88 "Headers that are added to the `message-mode' hidden headers
\r