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

diff --git a/09/c744ffa7640dfa672800e716553fae6d9c1491 b/09/c744ffa7640dfa672800e716553fae6d9c1491
new file mode 100644 (file)
index 0000000..e311e98
--- /dev/null
+++ b/09/c744ffa7640dfa672800e716553fae6d9c1491
@@ -0,0 +1,115 @@
+Return-Path: <dmitry.kurochkin@gmail.com>\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 DEBE2429E26\r
+       for <notmuch@notmuchmail.org>; Fri, 16 Dec 2011 04:32:04 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.799\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5\r
+       tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+       FREEMAIL_FROM=0.001, 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 x63Ow2fpYrqK for <notmuch@notmuchmail.org>;\r
+       Fri, 16 Dec 2011 04:32:04 -0800 (PST)\r
+Received: from mail-ww0-f45.google.com (mail-ww0-f45.google.com\r
+ [74.125.82.45])       (using TLSv1 with cipher RC4-SHA (128/128 bits))        (No client\r
+ certificate requested)        by olra.theworths.org (Postfix) with ESMTPS id\r
+ 2D8B9431FD0   for <notmuch@notmuchmail.org>; Fri, 16 Dec 2011 04:32:04 -0800\r
+ (PST)\r
+Received: by wgbds13 with SMTP id ds13so4869443wgb.2\r
+       for <notmuch@notmuchmail.org>; Fri, 16 Dec 2011 04:32:03 -0800 (PST)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;\r
+       h=from:to:subject:in-reply-to:references:user-agent:date:message-id\r
+       :mime-version:content-type;\r
+       bh=/xNTS0sUlrSZtCZ9aDZcPCJrT8Vw3B+NqlacBn1Z7nU=;\r
+       b=PIexlDeAZzupHiznaGO6X5F8l8VY7z7nW15DjC2UJWaqQFgFfmiOuNytfpwfy7q4rf\r
+       rE8tL2HMrmYr583ysqObZRusSb4qR+0M/7YD1Xihl8Wu6SGO8GKX8j5qCtiHW59nJhyd\r
+       c3oT7nOMalA3FYuLdjAX74j9UNH9oWA9lVO0A=\r
+Received: by 10.180.107.97 with SMTP id hb1mr12111802wib.18.1324038722954;\r
+       Fri, 16 Dec 2011 04:32:02 -0800 (PST)\r
+Received: from localhost ([91.144.186.21])\r
+       by mx.google.com with ESMTPS id b5sm14376217wbh.4.2011.12.16.04.32.01\r
+       (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Fri, 16 Dec 2011 04:32:02 -0800 (PST)\r
+From: Dmitry Kurochkin <dmitry.kurochkin@gmail.com>\r
+To: Jani Nikula <jani@nikula.org>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH 2/2] emacs: Fix notmuch-mua-user-agent defcustom\r
+In-Reply-To:\r
+ <4f5151bf4b16ca977c6cfe7e4bf2bf909281675b.1316804530.git.jani@nikula.org>\r
+References:\r
+ <864e58d004c991bcb823e0f61f33eb8cbbbb5b76.1316804530.git.jani@nikula.org>\r
+       <4f5151bf4b16ca977c6cfe7e4bf2bf909281675b.1316804530.git.jani@nikula.org>\r
+User-Agent: Notmuch/0.10.2+96~g74e5ae5 (http://notmuchmail.org) Emacs/23.3.1\r
+       (x86_64-pc-linux-gnu)\r
+Date: Fri, 16 Dec 2011 16:31:22 +0400\r
+Message-ID: <87iplgsnol.fsf@gmail.com>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\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: Fri, 16 Dec 2011 12:32:05 -0000\r
+\r
+On Fri, 23 Sep 2011 22:03:42 +0300, Jani Nikula <jani@nikula.org> wrote:\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
+\r
+I know little about the customize interface.  But the patch makes sense\r
+to me.\r
+\r
+Perhaps I would give mode detailed description for the options, but\r
+before the change there was none at all, so this is definitely an\r
+improvement.\r
+\r
+Regards,\r
+  Dmitry\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.4.1\r
+> \r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r