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

diff --git a/9c/6ddd8ea77837fba33a0712f741a20a65f71339 b/9c/6ddd8ea77837fba33a0712f741a20a65f71339
new file mode 100644 (file)
index 0000000..13ce424
--- /dev/null
+++ b/9c/6ddd8ea77837fba33a0712f741a20a65f71339
@@ -0,0 +1,93 @@
+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 3EC21429E37\r
+       for <notmuch@notmuchmail.org>; Wed,  7 Sep 2011 01:36:14 -0700 (PDT)\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 kcbk9eZPSm5l for <notmuch@notmuchmail.org>;\r
+       Wed,  7 Sep 2011 01:36:12 -0700 (PDT)\r
+Received: from mail-vw0-f44.google.com (mail-vw0-f44.google.com\r
+       [209.85.212.44]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 78C9D431FD0\r
+       for <notmuch@notmuchmail.org>; Wed,  7 Sep 2011 01:36:09 -0700 (PDT)\r
+Received: by vws12 with SMTP id 12so5230701vws.3\r
+       for <notmuch@notmuchmail.org>; Wed, 07 Sep 2011 01:36:08 -0700 (PDT)\r
+Received: by 10.52.93.20 with SMTP id cq20mr4823066vdb.373.1315384567936;\r
+       Wed, 07 Sep 2011 01:36:07 -0700 (PDT)\r
+Received: from localhost (nikula.org [92.243.24.172])\r
+       by mx.google.com with ESMTPS id jo8sm2064242vdb.20.2011.09.07.01.36.06\r
+       (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Wed, 07 Sep 2011 01:36:07 -0700 (PDT)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 2/2] emacs: Fix notmuch-mua-user-agent defcustom\r
+Date: Wed,  7 Sep 2011 08:35:59 +0000\r
+Message-Id:\r
+ <4652bdba350f4ff9c3bd2333d725a5ebabb5950a.1315384432.git.jani@nikula.org>\r
+X-Mailer: git-send-email 1.7.1\r
+In-Reply-To:\r
+ <de34a2673fb548c2624432fb9b9ce36043d9216f.1315384432.git.jani@nikula.org>\r
+References:\r
+ <de34a2673fb548c2624432fb9b9ce36043d9216f.1315384432.git.jani@nikula.org>\r
+In-Reply-To:\r
+ <de34a2673fb548c2624432fb9b9ce36043d9216f.1315384432.git.jani@nikula.org>\r
+References:\r
+ <de34a2673fb548c2624432fb9b9ce36043d9216f.1315384432.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: Wed, 07 Sep 2011 08:36:14 -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 8824b08..8b95bd4 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.1\r
+\r