More custom :type fixes

* lisp/lpr.el (lpr-headers-switches):
* lisp/emacs-lisp/testcover.el (testcover-compose-functions):
* lisp/cedet/ede/project-am.el (project-am-compile-project-command): Fix :type.

* lisp/progmodes/sql.el (sql-login-params): Fix and improve :type.

6 files changed, 53 insertions, 29 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5b9cf1dc455..fa835d5c6a9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
 2013-05-11  Glenn Morris  <rgm@gnu.org>
 
+	* lpr.el (lpr-headers-switches):
+	* emacs-lisp/testcover.el (testcover-compose-functions): Fix :type.
+
+	* progmodes/sql.el (sql-login-params): Fix and improve :type.
+
 	* emulation/edt-mapper.el: In batch mode, error rather than hang.
 
 	* term.el (term-set-escape-char): Make it idempotent.
diff --git a/lisp/cedet/ChangeLog b/lisp/cedet/ChangeLog
index 901e1c5057e..1290a3c8c51 100644
--- a/lisp/cedet/ChangeLog
+++ b/lisp/cedet/ChangeLog
@@ -1,3 +1,7 @@
+2013-05-11  Glenn Morris  <rgm@gnu.org>
+
+	* ede/project-am.el (project-am-compile-project-command): Fix :type.
+
 2013-05-09  Glenn Morris  <rgm@gnu.org>
 
 	* semantic/db-find.el (semanticdb-find-throttle-custom-list):
diff --git a/lisp/cedet/ede/project-am.el b/lisp/cedet/ede/project-am.el
index f49a9d07940..382963d55f9 100644
--- a/lisp/cedet/ede/project-am.el
+++ b/lisp/cedet/ede/project-am.el
@@ -55,7 +55,7 @@
 (defcustom project-am-compile-project-command nil
   "*Default command used to compile a project."
   :group 'project-am
-  :type 'string)
+  :type '(choice const nil) string)
 
 (defcustom project-am-compile-target-command (concat ede-make-command " -k %s")
   "*Default command used to compile a project."
diff --git a/lisp/emacs-lisp/testcover.el b/lisp/emacs-lisp/testcover.el
index 33bb1e3a732..a5619583145 100644
--- a/lisp/emacs-lisp/testcover.el
+++ b/lisp/emacs-lisp/testcover.el
@@ -118,7 +118,7 @@ calls to one of the `testcover-1value-functions', so if that's true then no
 brown splotch is shown for these.  This list is quite incomplete!  Most
 side-effect-free functions should be here."
   :group 'testcover
-  :type 'hook)
+  :type '(repeat symbol))
 
 (defcustom testcover-progn-functions
   '(define-key fset function goto-char mapc overlay-put progn
diff --git a/lisp/lpr.el b/lisp/lpr.el
index 88567abd246..0b860ed07f1 100644
--- a/lisp/lpr.el
+++ b/lisp/lpr.el
@@ -125,7 +125,9 @@ argument."
   "List of strings of options to request page headings in the printer program.
 If nil, we run `lpr-page-header-program' to make page headings
 and print the result."
-  :type '(repeat (string :tag "Argument"))
+  :type '(choice (const nil)
+		 (string :tag "Single argument")
+		 (repeat :tag "Multiple arguments" (string :tag "Argument")))
   :group 'lpr)
 
 (defcustom print-region-function nil
diff --git a/lisp/progmodes/sql.el b/lisp/progmodes/sql.el
index 3cf6757d5ec..940afc3d5f4 100644
--- a/lisp/progmodes/sql.el
+++ b/lisp/progmodes/sql.el
@@ -285,36 +285,49 @@ file.  Since that is a plaintext file, this could be dangerous."
 
 (define-widget 'sql-login-params 'lazy
   "Widget definition of the login parameters list"
-  ;; FIXME: does not implement :default property for the user,
-  ;; database and server options.  Anybody have some guidance on how to
-  ;; do this.
   :tag "Login Parameters"
-  :type '(repeat (choice
-                  (const user)
-                  (const password)
-                  (choice :tag "server"
-                          (const server)
-                          (list :tag "file"
-                                (const :format "" server)
-                                (const :format "" :file)
-                                regexp)
-                          (list :tag "completion"
-                                (const :format "" server)
+  :type '(set :tag "Login Parameters"
+              (choice :tag "user"
+                      :value user
+                      (const user)
+                      (list :tag "Specify a default"
+                            (const user)
+                            (list :tag "Default"
+                                  :inline t (const :default) string)))
+              (const password)
+              (choice :tag "server"
+                      :value server
+                      (const server)
+                      (list :tag "Specify a default"
+                            (const server)
+                            (list :tag "Default"
+                                  :inline t (const :default) string))
+                      (list :tag "file"
+                            (const :format "" server)
+                            (const :format "" :file)
+                            regexp)
+                      (list :tag "completion"
+                            (const :format "" server)
+                            (const :format "" :completion)
+                            (restricted-sexp
+                             :match-alternatives (listp stringp))))
+              (choice :tag "database"
+                      :value database
+                      (const database)
+                      (list :tag "Specify a default"
+                            (const database)
+                            (list :tag "Default"
+                                  :inline t (const :default) string))
+                      (list :tag "file"
+                            (const :format "" database)
+                            (const :format "" :file)
+                            regexp)
+                      (list :tag "completion"
+                            (const :format "" database)
                                 (const :format "" :completion)
                                 (restricted-sexp
                                  :match-alternatives (listp stringp))))
-                  (choice :tag "database"
-                          (const database)
-                          (list :tag "file"
-                                (const :format "" database)
-                                (const :format "" :file)
-                                regexp)
-                          (list :tag "completion"
-                                (const :format "" database)
-                                (const :format "" :completion)
-                                (restricted-sexp
-                                 :match-alternatives (listp stringp))))
-                  (const port))))
+              (const port)))
 
 ;; SQL Product support