[PATCH v2 2/2] emacs: Fix notmuch-mua-user-agent defcustom

diff --git a/b5/66f551a3427294869096d15880c99f16f9d1e6 b/b5/66f551a3427294869096d15880c99f16f9d1e6
new file mode 100644 (file)
index 0000000..a74e9b3
--- /dev/null
+++ b/b5/66f551a3427294869096d15880c99f16f9d1e6
@@ -0,0 +1,91 @@
+Return-Path: <jani@nikula.org>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 391B3429E29\r
+       for <notmuch@notmuchmail.org>; Tue, 20 Dec 2011 11:53:30 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References"\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id 5ZZmaXRdb3xu for <notmuch@notmuchmail.org>;\r
+       Tue, 20 Dec 2011 11:53:29 -0800 (PST)\r
+Received: from mail-ee0-f53.google.com (mail-ee0-f53.google.com\r
+ [74.125.83.53])       (using TLSv1 with cipher RC4-SHA (128/128 bits))        (No client\r
+ certificate requested)        by olra.theworths.org (Postfix) with ESMTPS id\r
+ 95D56431FD0   for <notmuch@notmuchmail.org>; Tue, 20 Dec 2011 11:53:27 -0800\r
+ (PST)\r
+Received: by mail-ee0-f53.google.com with SMTP id d41so8138952eek.26\r
+       for <notmuch@notmuchmail.org>; Tue, 20 Dec 2011 11:53:27 -0800 (PST)\r
+Received: by 10.14.50.202 with SMTP id z50mr1528222eeb.73.1324410807169;\r
+       Tue, 20 Dec 2011 11:53:27 -0800 (PST)\r
+Received: from localhost (dsl-hkibrasgw4-fe5cdc00-23.dhcp.inet.fi.\r
+       [80.220.92.23])\r
+       by mx.google.com with ESMTPS id j20sm10807763eej.8.2011.12.20.11.53.25\r
+       (version=SSLv3 cipher=OTHER); Tue, 20 Dec 2011 11:53:25 -0800 (PST)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 2/2] emacs: Fix notmuch-mua-user-agent defcustom\r
+Date: Tue, 20 Dec 2011 21:53:14 +0200\r
+Message-Id:\r
+ <f57278c429382294021bd5e6959886a5e44af594.1324410479.git.jani@nikula.org>\r
+X-Mailer: git-send-email 1.7.5.4\r
+In-Reply-To: <cover.1324410479.git.jani@nikula.org>\r
+References:\r
+ <864e58d004c991bcb823e0f61f33eb8cbbbb5b76.1316804530.git.jani@nikula.org>\r
+       <cover.1324410479.git.jani@nikula.org>\r
+In-Reply-To: <cover.1324410479.git.jani@nikula.org>\r
+References: <cover.1324410479.git.jani@nikula.org>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Tue, 20 Dec 2011 19:53:30 -0000\r
+\r
+The :options keyword is not meaningful for function type. Also, it was not\r
+possible to enter nil value, contrary to the notmuch-mua-user-agent\r
+defcustom documentation. Specify the alternatives using choice type, taking\r
+nil into account.\r
+\r
+Signed-off-by: Jani Nikula <jani@nikula.org>\r
+---\r
+ emacs/notmuch-mua.el |   10 ++++++----\r
+ 1 files changed, 6 insertions(+), 4 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el\r
+index b525762..7114e48 100644\r
+--- a/emacs/notmuch-mua.el\r
++++ b/emacs/notmuch-mua.el\r
+@@ -35,10 +35,12 @@\r
+   "Function used to generate a `User-Agent:' string. If this is\r
+ `nil' then no `User-Agent:' will be generated."\r
+   :group 'notmuch\r
+-  :type 'function\r
+-  :options '(notmuch-mua-user-agent-full\r
+-           notmuch-mua-user-agent-notmuch\r
+-           notmuch-mua-user-agent-emacs))\r
++  :type '(choice (const :tag "No user agent string" nil)\r
++               (const :tag "Full" notmuch-mua-user-agent-full)\r
++               (const :tag "Notmuch" notmuch-mua-user-agent-notmuch)\r
++               (const :tag "Emacs" notmuch-mua-user-agent-emacs)\r
++               (function :tag "Custom user agent function"\r
++                         :value notmuch-mua-user-agent-full)))\r
+ \r
+ (defcustom notmuch-mua-hidden-headers '("^User-Agent:")\r
+   "Headers that are added to the `message-mode' hidden headers\r
+-- \r
+1.7.5.4\r
+\r