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 3EC21429E37 for ; Wed, 7 Sep 2011 01:36:14 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" X-Spam-Flag: NO X-Spam-Score: -0.7 X-Spam-Level: X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 tests=[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 kcbk9eZPSm5l for ; Wed, 7 Sep 2011 01:36:12 -0700 (PDT) Received: from mail-vw0-f44.google.com (mail-vw0-f44.google.com [209.85.212.44]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id 78C9D431FD0 for ; Wed, 7 Sep 2011 01:36:09 -0700 (PDT) Received: by vws12 with SMTP id 12so5230701vws.3 for ; Wed, 07 Sep 2011 01:36:08 -0700 (PDT) Received: by 10.52.93.20 with SMTP id cq20mr4823066vdb.373.1315384567936; Wed, 07 Sep 2011 01:36:07 -0700 (PDT) Received: from localhost (nikula.org [92.243.24.172]) by mx.google.com with ESMTPS id jo8sm2064242vdb.20.2011.09.07.01.36.06 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 07 Sep 2011 01:36:07 -0700 (PDT) From: Jani Nikula To: notmuch@notmuchmail.org Subject: [PATCH 2/2] emacs: Fix notmuch-mua-user-agent defcustom Date: Wed, 7 Sep 2011 08:35:59 +0000 Message-Id: <4652bdba350f4ff9c3bd2333d725a5ebabb5950a.1315384432.git.jani@nikula.org> X-Mailer: git-send-email 1.7.1 In-Reply-To: References: In-Reply-To: References: 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, 07 Sep 2011 08:36:14 -0000 The :options keyword is not meaningful for function type. Also, it was not possible to enter nil value, contrary to the notmuch-mua-user-agent defcustom documentation. Specify the alternatives using choice type, taking nil into account. Signed-off-by: Jani Nikula --- emacs/notmuch-mua.el | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el index 8824b08..8b95bd4 100644 --- a/emacs/notmuch-mua.el +++ b/emacs/notmuch-mua.el @@ -35,10 +35,12 @@ "Function used to generate a `User-Agent:' string. If this is `nil' then no `User-Agent:' will be generated." :group 'notmuch - :type 'function - :options '(notmuch-mua-user-agent-full - notmuch-mua-user-agent-notmuch - notmuch-mua-user-agent-emacs)) + :type '(choice (const :tag "No user agent string" nil) + (const :tag "Full" notmuch-mua-user-agent-full) + (const :tag "Notmuch" notmuch-mua-user-agent-notmuch) + (const :tag "Emacs" notmuch-mua-user-agent-emacs) + (function :tag "Custom user agent function" + :value notmuch-mua-user-agent-full))) (defcustom notmuch-mua-hidden-headers '("^User-Agent:") "Headers that are added to the `message-mode' hidden headers -- 1.7.1