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 3EC21429E37
\r
6 for <notmuch@notmuchmail.org>; Wed, 7 Sep 2011 01:36:14 -0700 (PDT)
\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 kcbk9eZPSm5l for <notmuch@notmuchmail.org>;
\r
17 Wed, 7 Sep 2011 01:36:12 -0700 (PDT)
\r
18 Received: from mail-vw0-f44.google.com (mail-vw0-f44.google.com
\r
19 [209.85.212.44]) (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 78C9D431FD0
\r
22 for <notmuch@notmuchmail.org>; Wed, 7 Sep 2011 01:36:09 -0700 (PDT)
\r
23 Received: by vws12 with SMTP id 12so5230701vws.3
\r
24 for <notmuch@notmuchmail.org>; Wed, 07 Sep 2011 01:36:08 -0700 (PDT)
\r
25 Received: by 10.52.93.20 with SMTP id cq20mr4823066vdb.373.1315384567936;
\r
26 Wed, 07 Sep 2011 01:36:07 -0700 (PDT)
\r
27 Received: from localhost (nikula.org [92.243.24.172])
\r
28 by mx.google.com with ESMTPS id jo8sm2064242vdb.20.2011.09.07.01.36.06
\r
29 (version=TLSv1/SSLv3 cipher=OTHER);
\r
30 Wed, 07 Sep 2011 01:36:07 -0700 (PDT)
\r
31 From: Jani Nikula <jani@nikula.org>
\r
32 To: notmuch@notmuchmail.org
\r
33 Subject: [PATCH 2/2] emacs: Fix notmuch-mua-user-agent defcustom
\r
34 Date: Wed, 7 Sep 2011 08:35:59 +0000
\r
36 <4652bdba350f4ff9c3bd2333d725a5ebabb5950a.1315384432.git.jani@nikula.org>
\r
37 X-Mailer: git-send-email 1.7.1
\r
39 <de34a2673fb548c2624432fb9b9ce36043d9216f.1315384432.git.jani@nikula.org>
\r
41 <de34a2673fb548c2624432fb9b9ce36043d9216f.1315384432.git.jani@nikula.org>
\r
43 <de34a2673fb548c2624432fb9b9ce36043d9216f.1315384432.git.jani@nikula.org>
\r
45 <de34a2673fb548c2624432fb9b9ce36043d9216f.1315384432.git.jani@nikula.org>
\r
46 X-BeenThere: notmuch@notmuchmail.org
\r
47 X-Mailman-Version: 2.1.13
\r
49 List-Id: "Use and development of the notmuch mail system."
\r
50 <notmuch.notmuchmail.org>
\r
51 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
52 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
53 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
54 List-Post: <mailto:notmuch@notmuchmail.org>
\r
55 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
56 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
57 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
58 X-List-Received-Date: Wed, 07 Sep 2011 08:36:14 -0000
\r
60 The :options keyword is not meaningful for function type. Also, it was not
\r
61 possible to enter nil value, contrary to the notmuch-mua-user-agent
\r
62 defcustom documentation. Specify the alternatives using choice type, taking
\r
65 Signed-off-by: Jani Nikula <jani@nikula.org>
\r
67 emacs/notmuch-mua.el | 10 ++++++----
\r
68 1 files changed, 6 insertions(+), 4 deletions(-)
\r
70 diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el
\r
71 index 8824b08..8b95bd4 100644
\r
72 --- a/emacs/notmuch-mua.el
\r
73 +++ b/emacs/notmuch-mua.el
\r
75 "Function used to generate a `User-Agent:' string. If this is
\r
76 `nil' then no `User-Agent:' will be generated."
\r
79 - :options '(notmuch-mua-user-agent-full
\r
80 - notmuch-mua-user-agent-notmuch
\r
81 - notmuch-mua-user-agent-emacs))
\r
82 + :type '(choice (const :tag "No user agent string" nil)
\r
83 + (const :tag "Full" notmuch-mua-user-agent-full)
\r
84 + (const :tag "Notmuch" notmuch-mua-user-agent-notmuch)
\r
85 + (const :tag "Emacs" notmuch-mua-user-agent-emacs)
\r
86 + (function :tag "Custom user agent function"
\r
87 + :value notmuch-mua-user-agent-full)))
\r
89 (defcustom notmuch-mua-hidden-headers '("^User-Agent:")
\r
90 "Headers that are added to the `message-mode' hidden headers
\r