[PATCH 1/2] emacs: Fix notmuch-hello-tag-list-make-query defcustom

[PATCH 1/2] emacs: Fix notmuch-hello-tag-list-make-query defcustom

[Jani Nikula]

It was not possible to define custom filters or filter functions because
the types were const. Remove const to allow editing.

Signed-off-by: Jani Nikula <jani@nikula.org>
---
 emacs/notmuch-hello.el |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/emacs/notmuch-hello.el b/emacs/notmuch-hello.el
index 65fde75..ad1a13f 100644
--- a/emacs/notmuch-hello.el
+++ b/emacs/notmuch-hello.el
@@ -66,8 +66,8 @@ Finally this can be a function that will be called for each tag and
 should return a filter for that tag, or nil to hide the tag."
   :type '(choice (const :tag "All messages" nil)
 		 (const :tag "Unread messages" "tag:unread")
-		 (const :tag "Custom filter" string)
-		 (const :tag "Custom filter function" function))
+		 (string :tag "Custom filter")
+		 (function :tag "Custom filter function"))
   :group 'notmuch)
 
 (defcustom notmuch-hello-hide-tags nil
-- 
1.7.1

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

[Jani Nikula]

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 <jani@nikula.org>
---
 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

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

[Jani Nikula]

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 <jani@nikula.org>
---
 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.4.1

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

[Dmitry Kurochkin]

On Fri, 23 Sep 2011 22:03:42 +0300, Jani Nikula <jani@nikula.org> wrote:
> 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.
> 

I know little about the customize interface.  But the patch makes sense
to me.

Perhaps I would give mode detailed description for the options, but
before the change there was none at all, so this is definitely an
improvement.

Regards,
  Dmitry

> Signed-off-by: Jani Nikula <jani@nikula.org>
> ---
>  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.4.1
> 
> _______________________________________________
> notmuch mailing list
> notmuch@notmuchmail.org
> http://notmuchmail.org/mailman/listinfo/notmuch