(auth-sources): Fix up definition so extra parameters

are always inline.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7dbbdca..b4c3628 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-23  Teodor Zlatanov  <tzz@lifelogs.com>
+
+       * auth-source.el (auth-sources): Fix up definition so extra parameters
+       are always inline.
+
 2010-03-22  Martin Stjernholm <mast@lysator.liu.se>
 
        * nnimap.el (nnimap-verify-uidvalidity): Fixed bug where uidvalidity

diff --git a/lisp/auth-source.el b/lisp/auth-source.el
index 5a628d0..bfe470c 100644 (file)
--- a/lisp/auth-source.el
+++ b/lisp/auth-source.el
@@ -103,7 +103,7 @@ Only relevant if `auth-source-debug' is not nil."
   :version "23.2" ;; No Gnus
   :type `boolean)
 
-(defcustom auth-sources '((:source "~/.authinfo.gpg" :host t :protocol t nil))
+(defcustom auth-sources '((:source "~/.authinfo.gpg" :host t :protocol t))
   "List of authentication sources.
 
 Each entry is the authentication type with optional properties.
@@ -136,9 +136,9 @@ can get pretty complex."
                               (const :tag "Any" t)
                               (const :tag "Fallback" nil)
                               ,@auth-source-protocols-customize)
-                      (repeat :tag "Extra Parameters"
+                      (repeat :tag "Extra Parameters" :inline t
                               (choice :tag "Extra parameter"
-                                      (list :tag "Preferred username"
+                                      (list :tag "Preferred username" :inline t
                                             (const :format "" :value :preferred-username)
                                             (choice :tag "Personality or username"
                                                     (const :tag "Any" t)