Fix a bunch of custom types (thank you cus-test.el)

* lisp/bookmark.el (bookmark-search-delay):
* lisp/cus-start.el (vertical-centering-font-regexp):
* lisp/ps-mule.el (ps-mule-font-info-database-default):
* lisp/ps-print.el (ps-default-fg, ps-default-bg):
* lisp/type-break.el (type-break-good-break-interval):
* lisp/whitespace.el (whitespace-indentation-regexp)
(whitespace-space-after-tab-regexp):
* lisp/emacs-lisp/testcover.el (testcover-1value-functions)
(testcover-noreturn-functions, testcover-progn-functions)
(testcover-prog1-functions):
* lisp/emulation/viper-init.el (viper-emacs-state-cursor-color):
* lisp/erc/erc-desktop-notifications.el (erc-notifications-icon):
* lisp/eshell/em-glob.el (eshell-glob-translate-alist):
* lisp/gnus/gnus-art.el (gnus-article-date-headers, gnus-blocked-images):
* lisp/gnus/gnus-async.el (gnus-async-post-fetch-function):
* lisp/gnus/gnus-gravatar.el (gnus-gravatar-size, gnus-gravatar-properties):
* lisp/gnus/gnus-html.el (gnus-html-image-cache-ttl):
* lisp/gnus/gnus-notifications.el (gnus-notifications-timeout):
* lisp/gnus/gnus-picon.el (gnus-picon-properties):
* lisp/gnus/gnus-util.el (gnus-completion-styles):
* lisp/gnus/gnus.el (gnus-other-frame-resume-function):
* lisp/gnus/message.el (message-user-organization-file)
(message-cite-reply-position):
* lisp/gnus/nnir.el (nnir-summary-line-format)
(nnir-retrieve-headers-override-function):
* lisp/gnus/shr-color.el (shr-color-visible-luminance-min):
* lisp/gnus/shr.el (shr-blocked-images):
* lisp/gnus/spam-report.el (spam-report-resend-to):
* lisp/gnus/spam.el (spam-summary-exit-behavior):
* lisp/mh-e/mh-e.el (mh-sortm-args, mh-default-folder-for-message-function):
* lisp/play/tetris.el (tetris-tty-colors):
* lisp/progmodes/cpp.el (cpp-face-default-list):
* lisp/progmodes/flymake.el (flymake-allowed-file-name-masks):
* lisp/progmodes/idlw-help.el (idlwave-help-browser-generic-program)
(idlwave-help-browser-generic-args):
* lisp/progmodes/make-mode.el (makefile-special-targets-list):
* lisp/progmodes/python.el (python-shell-virtualenv-path):
* lisp/progmodes/verilog-mode.el (verilog-active-low-regexp)
(verilog-auto-input-ignore-regexp, verilog-auto-inout-ignore-regexp)
(verilog-auto-output-ignore-regexp, verilog-auto-tieoff-ignore-regexp)
(verilog-auto-unused-ignore-regexp, verilog-typedef-regexp):
* lisp/textmodes/reftex-vars.el (reftex-format-label-function):
* lisp/textmodes/remember.el (remember-diary-file):
Fix custom types.

* lisp/cedet/semantic/db-find.el (semanticdb-find-throttle-custom-list):
Fix value.

* lisp/gnus/gnus-salt.el (gnus-selected-tree-face): Fix default.

41 files changed, 200 insertions, 92 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d5d2c80d61..a84e83f05d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,31 @@
 2013-05-09  Glenn Morris  <rgm@gnu.org>
 
+	* bookmark.el (bookmark-search-delay):
+	* cus-start.el (vertical-centering-font-regexp):
+	* ps-mule.el (ps-mule-font-info-database-default):
+	* ps-print.el (ps-default-fg, ps-default-bg):
+	* type-break.el (type-break-good-break-interval):
+	* whitespace.el (whitespace-indentation-regexp)
+	(whitespace-space-after-tab-regexp):
+	* emacs-lisp/testcover.el (testcover-1value-functions)
+	(testcover-noreturn-functions, testcover-progn-functions)
+	(testcover-prog1-functions):
+	* emulation/viper-init.el (viper-emacs-state-cursor-color):
+	* eshell/em-glob.el (eshell-glob-translate-alist):
+	* play/tetris.el (tetris-tty-colors):
+	* progmodes/cpp.el (cpp-face-default-list):
+	* progmodes/flymake.el (flymake-allowed-file-name-masks):
+	* progmodes/idlw-help.el (idlwave-help-browser-generic-program)
+	(idlwave-help-browser-generic-args):
+	* progmodes/make-mode.el (makefile-special-targets-list):
+	* progmodes/python.el (python-shell-virtualenv-path):
+	* progmodes/verilog-mode.el (verilog-active-low-regexp)
+	(verilog-auto-input-ignore-regexp, verilog-auto-inout-ignore-regexp)
+	(verilog-auto-output-ignore-regexp, verilog-auto-tieoff-ignore-regexp)
+	(verilog-auto-unused-ignore-regexp, verilog-typedef-regexp):
+	* textmodes/reftex-vars.el (reftex-format-label-function):
+	* textmodes/remember.el (remember-diary-file): Fix custom types.
+
 	* jka-cmpr-hook.el (jka-compr-mode-alist-additions): Fix typo.
 	Add :version.
 
diff --git a/lisp/bookmark.el b/lisp/bookmark.el
index 482cdf9275..cab81c3b13 100644
--- a/lisp/bookmark.el
+++ b/lisp/bookmark.el
@@ -170,7 +170,7 @@ A non-nil value may result in truncated bookmark names."
 (defcustom bookmark-search-delay 0.2
   "Time before `bookmark-bmenu-search' updates the display."
   :group 'bookmark
-  :type  'integer)
+  :type  'number)
 
 (defface bookmark-menu-heading
   '((t (:inherit font-lock-type-face)))
diff --git a/lisp/cedet/ChangeLog b/lisp/cedet/ChangeLog
index 944a9e1a02..901e1c5057 100644
--- a/lisp/cedet/ChangeLog
+++ b/lisp/cedet/ChangeLog
@@ -1,3 +1,8 @@
+2013-05-09  Glenn Morris  <rgm@gnu.org>
+
+	* semantic/db-find.el (semanticdb-find-throttle-custom-list):
+	Fix value.
+
 2013-04-27  David Engster  <deng@randomsample.de>
 
 	* semantic/complete.el
diff --git a/lisp/cedet/semantic/db-find.el b/lisp/cedet/semantic/db-find.el
index 2e4ca319a9..91b1e34b69 100644
--- a/lisp/cedet/semantic/db-find.el
+++ b/lisp/cedet/semantic/db-find.el
@@ -130,12 +130,12 @@
 (declare-function ede-current-project "ede")
 
 (defvar semanticdb-find-throttle-custom-list
-  '(repeat (radio (const 'local)
-		  (const 'project)
-		  (const 'unloaded)
-		  (const 'system)
-		  (const 'recursive)
-		  (const 'omniscience)))
+  '(set (const local)
+	(const project)
+	(const unloaded)
+	(const system)
+	(const recursive)
+	(const omniscience))
   "Customization values for semanticdb find throttle.
 See `semanticdb-find-throttle' for details.")
 
diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index 2e442b6c94..43d71ceec9 100644
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -252,7 +252,9 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
 	     (use-file-dialog menu boolean "22.1")
 	     (focus-follows-mouse frames boolean "20.3")
 	     ;; fontset.c
-	     (vertical-centering-font-regexp display regexp)
+	     ;; FIXME nil is the initial value, fontset.el setqs it.
+	     (vertical-centering-font-regexp display
+					     (choice (const nil) regexp))
 	     ;; frame.c
 	     (default-frame-alist frames
 	       (repeat (cons :format "%v"
diff --git a/lisp/emacs-lisp/testcover.el b/lisp/emacs-lisp/testcover.el
index f6bd26e9f3..33bb1e3a73 100644
--- a/lisp/emacs-lisp/testcover.el
+++ b/lisp/emacs-lisp/testcover.el
@@ -100,14 +100,14 @@ current global map.  The macro `lambda' is self-evaluating, hence always
 returns the same value (the function it defines may return varying values
 when called)."
   :group 'testcover
-  :type 'hook)
+  :type '(repeat symbol))
 
 (defcustom testcover-noreturn-functions
   '(error noreturn throw signal)
   "Subset of `testcover-1value-functions' -- these never return.  We mark
 them as having returned nil just before calling them."
   :group 'testcover
-  :type 'hook)
+  :type '(repeat symbol))
 
 (defcustom testcover-compose-functions
   '(+ - * / = append length list make-keymap make-sparse-keymap
@@ -132,7 +132,7 @@ brown splotch is shown for these if the last argument is a constant or a
 call to one of the `testcover-1value-functions'.  This list is probably
 incomplete!"
   :group 'testcover
-  :type 'hook)
+  :type '(repeat symbol))
 
 (defcustom testcover-prog1-functions
   '(prog1 unwind-protect)
@@ -140,7 +140,7 @@ incomplete!"
 brown splotch is shown for these if the first argument is a constant or a
 call to one of the `testcover-1value-functions'."
   :group 'testcover
-  :type 'hook)
+  :type '(repeat symbol))
 
 (defcustom testcover-potentially-1value-functions
   '(add-hook and beep or remove-hook unless when)
diff --git a/lisp/emulation/viper-init.el b/lisp/emulation/viper-init.el
index 28a830a0de..76d4632f8c 100644
--- a/lisp/emulation/viper-init.el
+++ b/lisp/emulation/viper-init.el
@@ -424,7 +424,7 @@ delete the text being replaced, as in standard Vi."
 ;; (defcustom viper-emacs-state-cursor-color "Magenta"
 (defcustom viper-emacs-state-cursor-color nil
   "Cursor color when Viper is in Emacs state."
-  :type 'string
+  :type '(choice (const nil) string)
   :group 'viper)
 
 ;; internal var, used to remember the default cursor color of emacs frames
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index f3d5478289..f2c1dbe236 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,8 @@
+2013-05-09  Glenn Morris  <rgm@gnu.org>
+
+	* erc-desktop-notifications.el (erc-notifications-icon):
+	Fix custom type.
+
 2013-02-13  Aidan Gauland  <aidalgol@no8wireless.co.nz>
 
 	* erc-match.el (erc-match-message): Fix last commit.
diff --git a/lisp/erc/erc-desktop-notifications.el b/lisp/erc/erc-desktop-notifications.el
index 2cff817b34..ac6c202b18 100644
--- a/lisp/erc/erc-desktop-notifications.el
+++ b/lisp/erc/erc-desktop-notifications.el
@@ -44,7 +44,7 @@
 (defcustom erc-notifications-icon nil
   "Icon to use for notification."
   :group 'erc-notifications
-  :type 'file)
+  :type '(choice (const :tag "No icon" nil) file))
 
 (defun erc-notifications-notify (nick msg)
   "Notify that NICK send some MSG.
diff --git a/lisp/eshell/em-glob.el b/lisp/eshell/em-glob.el
index 5a21f463f0..866412d252 100644
--- a/lisp/eshell/em-glob.el
+++ b/lisp/eshell/em-glob.el
@@ -119,7 +119,8 @@ This option slows down recursive glob processing by quite a bit."
 			     "*" "+")) (+ pos 2))
 	       (cons "*" (1+ pos))))))
   "An alist for translation of extended globbing characters."
-  :type '(repeat (cons character (choice regexp function)))
+  :type '(alist :key-type character
+		:value-type (choice string function))
   :group 'eshell-glob)
 
 ;;; Functions:
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 6a2e83f30e..ede6435789 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,24 @@
+2013-05-09  Glenn Morris  <rgm@gnu.org>
+
+	* gnus-art.el (gnus-article-date-headers, gnus-blocked-images):
+	* gnus-async.el (gnus-async-post-fetch-function):
+	* gnus-gravatar.el (gnus-gravatar-size, gnus-gravatar-properties):
+	* gnus-html.el (gnus-html-image-cache-ttl):
+	* gnus-notifications.el (gnus-notifications-timeout):
+	* gnus-picon.el (gnus-picon-properties):
+	* gnus-util.el (gnus-completion-styles):
+	* gnus.el (gnus-other-frame-resume-function):
+	* message.el (message-user-organization-file)
+	(message-cite-reply-position):
+	* nnir.el (nnir-summary-line-format)
+	(nnir-retrieve-headers-override-function):
+	* shr-color.el (shr-color-visible-luminance-min):
+	* shr.el (shr-blocked-images):
+	* spam-report.el (spam-report-resend-to):
+	* spam.el (spam-summary-exit-behavior): Fix custom types.
+
+	* gnus-salt.el (gnus-selected-tree-face): Fix default.
+
 2013-05-07  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* gnus-art.el (gnus-article-describe-bindings): Require help-mode
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 402a06145c..23603bc772 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -1032,15 +1032,15 @@ Some of these headers are updated automatically.  See
 `gnus-article-update-date-headers' for details."
   :version "24.1"
   :group 'gnus-article-headers
-  :type '(repeat
-	  (item :tag "Universal time (UT)" :value 'ut)
-	  (item :tag "Local time zone" :value 'local)
-	  (item :tag "Readable English" :value 'english)
-	  (item :tag "Elapsed time" :value 'lapsed)
-	  (item :tag "Original and elapsed time" :value 'combined-lapsed)
-	  (item :tag "Original date header" :value 'original)
-	  (item :tag "ISO8601 format" :value 'iso8601)
-	  (item :tag "User-defined" :value 'user-defined)))
+  :type '(set
+	  (const :tag "Universal time (UT)" ut)
+	  (const :tag "Local time zone" local)
+	  (const :tag "Readable English" english)
+	  (const :tag "Elapsed time" lapsed)
+	  (const :tag "Original and elapsed time" combined-lapsed)
+	  (const :tag "Original date header" original)
+	  (const :tag "ISO8601 format" iso8601)
+	  (const :tag "User-defined" user-defined)))
 
 (defcustom gnus-article-update-date-headers nil
   "A number that says how often to update the date header (in seconds).
@@ -1651,7 +1651,7 @@ called with the group name as the parameter, and should return a
 regexp."
   :version "24.1"
   :group 'gnus-art
-  :type 'regexp)
+  :type '(choice regexp function))
 
 ;;; Internal variables
 
diff --git a/lisp/gnus/gnus-async.el b/lisp/gnus/gnus-async.el
index c5d6433254..d0afd1aa93 100644
--- a/lisp/gnus/gnus-async.el
+++ b/lisp/gnus/gnus-async.el
@@ -76,7 +76,7 @@ The function will be called narrowed to the region of the article
 that was fetched."
   :version "24.1"
   :group 'gnus-asynchronous
-  :type 'function)
+  :type '(choice (const nil) function))
 
 ;;; Internal variables.
 
diff --git a/lisp/gnus/gnus-gravatar.el b/lisp/gnus/gnus-gravatar.el
index 8b9c49a998..33bcb6b159 100644
--- a/lisp/gnus/gnus-gravatar.el
+++ b/lisp/gnus/gnus-gravatar.el
@@ -35,13 +35,13 @@
 (defcustom gnus-gravatar-size nil
   "How big should gravatars be displayed.
 If nil, default to `gravatar-size'."
-  :type 'integer
+  :type '(choice (const nil) integer)
   :version "24.1"
   :group 'gnus-gravatar)
 
 (defcustom gnus-gravatar-properties '(:ascent center :relief 1)
   "List of image properties applied to Gravatar images."
-  :type 'list
+  :type 'sexp
   :version "24.1"
   :group 'gnus-gravatar)
 
diff --git a/lisp/gnus/gnus-html.el b/lisp/gnus/gnus-html.el
index bdf03a1658..a5625dfed8 100644
--- a/lisp/gnus/gnus-html.el
+++ b/lisp/gnus/gnus-html.el
@@ -45,7 +45,10 @@
   "Time used to determine if we should use images from the cache."
   :version "24.1"
   :group 'gnus-art
-  :type 'integer)
+  ;; FIXME hardly the friendliest type.  The allowed value is actually
+  ;; any time value, but we are assuming no-one cares about USEC and
+  ;; PSEC here.  It would be better to eg make it a number of minutes.
+  :type '(list integer integer))
 
 (defcustom gnus-html-image-automatic-caching t
   "Whether automatically cache retrieve images."
diff --git a/lisp/gnus/gnus-notifications.el b/lisp/gnus/gnus-notifications.el
index 224b59b051..f29bdb7b05 100644
--- a/lisp/gnus/gnus-notifications.el
+++ b/lisp/gnus/gnus-notifications.el
@@ -64,7 +64,8 @@ not get notifications."
 
 (defcustom gnus-notifications-timeout nil
   "Timeout used for notifications sent via `notifications-notify'."
-  :type 'integer
+  :type '(choice (const :tag "Server default" nil)
+                 (integer :tag "Milliseconds"))
   :group 'gnus-notifications)
 
 (defvar gnus-notifications-sent nil
diff --git a/lisp/gnus/gnus-picon.el b/lisp/gnus/gnus-picon.el
index 4f28f8ebc0..5402982b96 100644
--- a/lisp/gnus/gnus-picon.el
+++ b/lisp/gnus/gnus-picon.el
@@ -77,7 +77,7 @@ Some people may want to add \"unknown\" to this list."
 
 (defcustom gnus-picon-properties '(:color-symbols (("None" . "white")))
   "List of image properties applied to picons."
-  :type 'list
+  :type 'sexp
   :version "24.3"
   :group 'gnus-picon)
 
diff --git a/lisp/gnus/gnus-salt.el b/lisp/gnus/gnus-salt.el
index 48b51d2c95..6b8e105e6b 100644
--- a/lisp/gnus/gnus-salt.el
+++ b/lisp/gnus/gnus-salt.el
@@ -385,7 +385,7 @@ lines."
 		 integer)
   :group 'gnus-summary-tree)
 
-(defcustom gnus-selected-tree-face 'modeline
+(defcustom gnus-selected-tree-face 'mode-line
   "*Face used for highlighting selected articles in the thread tree."
   :type 'face
   :group 'gnus-summary-tree)
diff --git a/lisp/gnus/gnus-util.el b/lisp/gnus/gnus-util.el
index a121c27b54..6e2c586dc4 100644
--- a/lisp/gnus/gnus-util.el
+++ b/lisp/gnus/gnus-util.el
@@ -68,7 +68,7 @@
   "Value of `completion-styles' to use when completing."
   :version "24.1"
   :group 'gnus-meta
-  :type 'list)
+  :type '(repeat symbol))
 
 ;; Fixme: this should be a gnus variable, not nnmail-.
 (defvar nnmail-pathname-coding-system)
diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el
index f6c1327c78..fd6ebf338f 100644
--- a/lisp/gnus/gnus.el
+++ b/lisp/gnus/gnus.el
@@ -2507,6 +2507,7 @@ Disabling the agent may result in noticeable loss of performance."
   :version "24.4"
   :group 'gnus-start
   :type '(choice (function-item gnus)
+		 (function-item gnus-group-get-new-news)
 		 (function-item gnus-no-server)
 		 (function-item gnus-slave)
 		 (function-item gnus-slave-no-server)))
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index a6638097b4..501a2e6f83 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -527,7 +527,7 @@ If t, use `message-user-organization-file'."
 	(setq orgfile f)))
     orgfile)
   "*Local news organization file."
-  :type 'file
+  :type '(choice (const nil) file)
   :link '(custom-manual "(message)News Headers")
   :group 'message-headers)
 
@@ -1098,9 +1098,9 @@ e.g. using `gnus-posting-styles':
 
   (eval (set (make-local-variable 'message-cite-reply-position) 'above))"
   :version "24.1"
-  :type '(choice (const :tag "Reply inline" 'traditional)
-		 (const :tag "Reply above" 'above)
-		 (const :tag "Reply below" 'below))
+  :type '(choice (const :tag "Reply inline" traditional)
+		 (const :tag "Reply above" above)
+		 (const :tag "Reply below" below))
   :group 'message-insertion)
 
 (defcustom message-cite-style nil
diff --git a/lisp/gnus/nnir.el b/lisp/gnus/nnir.el
index 21f81dc664..120149ae0f 100644
--- a/lisp/gnus/nnir.el
+++ b/lisp/gnus/nnir.el
@@ -326,7 +326,7 @@ with three items unique to nnir summary buffers:
 
 If nil this will use `gnus-summary-line-format'."
   :version "24.1"
-  :type '(string)
+  :type '(choice (const :tag "gnus-summary-line-format" nil) string)
   :group 'nnir)
 
 (defcustom nnir-retrieve-headers-override-function nil
@@ -338,7 +338,7 @@ retrieved header format.
 If this variable is nil, or if the provided function returns nil for a search
 result, `gnus-retrieve-headers' will be called instead."
   :version "24.1"
-  :type '(function)
+  :type '(choice (const :tag "gnus-retrieve-headers" nil) function)
   :group 'nnir)
 
 (defcustom nnir-imap-default-search-key "whole message"
diff --git a/lisp/gnus/shr-color.el b/lisp/gnus/shr-color.el
index 91b2cf79a1..0b320a21ad 100644
--- a/lisp/gnus/shr-color.el
+++ b/lisp/gnus/shr-color.el
@@ -37,7 +37,7 @@
   "Minimum luminance distance between two colors to be considered visible.
 Must be between 0 and 100."
   :group 'shr
-  :type 'float)
+  :type 'number)
 
 (defcustom shr-color-visible-distance-min 5
   "Minimum color distance between two colors to be considered visible.
diff --git a/lisp/gnus/shr.el b/lisp/gnus/shr.el
index 293ba2445e..5c1b99e770 100644
--- a/lisp/gnus/shr.el
+++ b/lisp/gnus/shr.el
@@ -52,7 +52,7 @@ fit these criteria."
   "Images that have URLs matching this regexp will be blocked."
   :version "24.1"
   :group 'shr
-  :type 'regexp)
+  :type '(choice (const nil) regexp))
 
 (defcustom shr-table-horizontal-line ?\s
   "Character used to draw horizontal table lines."
diff --git a/lisp/gnus/spam-report.el b/lisp/gnus/spam-report.el
index 06aae2906c..24e1ca7bda 100644
--- a/lisp/gnus/spam-report.el
+++ b/lisp/gnus/spam-report.el
@@ -81,7 +81,7 @@ The function must accept the arguments `host' and `report'."
   "Email address that spam articles are resent to when reporting.
 If not set, the user will be prompted to enter a value which will be
 saved for future use."
-  :type 'string
+  :type '(choice (const :tag "Prompt" nil) string)
   :group 'spam-report)
 
 (defvar spam-report-url-ping-temp-agent-function nil
diff --git a/lisp/gnus/spam.el b/lisp/gnus/spam.el
index 063ba28d6e..725017ca11 100644
--- a/lisp/gnus/spam.el
+++ b/lisp/gnus/spam.el
@@ -94,14 +94,14 @@ Note that setting the `spam-use-move' or `spam-use-copy' backends on
 a group through group/topic parameters overrides this mechanism."
   :type '(choice
           (const
-           'default
-           :tag "Move spam out of all groups and ham out of spam groups.")
+           :tag "Move spam out of all groups and ham out of spam groups"
+           default)
           (const
-           'move-all
-           :tag "Move spam out of all groups and ham out of all groups.")
+           :tag "Move spam out of all groups and ham out of all groups"
+           move-all)
           (const
-           'move-none
-           :tag "Never move spam or ham out of any groups."))
+           :tag "Never move spam or ham out of any groups"
+           move-none))
   :group 'spam)
 
 (defcustom spam-directory (nnheader-concat gnus-directory "spam/")
diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog
index 87e0bf1870..f256e3841e 100644
--- a/lisp/mh-e/ChangeLog
+++ b/lisp/mh-e/ChangeLog
@@ -1,3 +1,8 @@
+2013-05-09  Glenn Morris  <rgm@gnu.org>
+
+	* mh-e.el (mh-sortm-args, mh-default-folder-for-message-function):
+	Fix custom types.
+
 2013-05-08  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* mh-comp.el (mh-regexp-in-field-p): Minor simplification.
diff --git a/lisp/mh-e/mh-e.el b/lisp/mh-e/mh-e.el
index 6ed033b8fa..303d817ded 100644
--- a/lisp/mh-e/mh-e.el
+++ b/lisp/mh-e/mh-e.el
@@ -1354,7 +1354,7 @@ This option is consulted when a prefix argument is used with
 specified in the MH profile. This option may be used to provide
 an alternate view. For example, \"'(\"-nolimit\" \"-textfield\"
 \"subject\")\" is a useful setting."
-  :type 'string
+  :type '(repeat string)
   :group 'mh-folder
   :package-version '(MH-E . "8.0"))
 
@@ -1368,7 +1368,7 @@ being refiled and point is at the start of the message. This function
 should return the default folder as a string with a leading \"+\"
 sign. It can also return nil so that the last folder name is used as
 the default, or an empty string to suppress the default entirely."
-  :type 'function
+  :type '(choice (const nil) function)
   :group 'mh-folder-selection
   :package-version '(MH-E . "8.0"))
 
diff --git a/lisp/play/tetris.el b/lisp/play/tetris.el
index dd33d06724..19fa8f38a7 100644
--- a/lisp/play/tetris.el
+++ b/lisp/play/tetris.el
@@ -77,20 +77,13 @@ If the return value is a number, it is used as the timer period."
   ["blue" "white" "yellow" "magenta" "cyan" "green" "red"]
   "Vector of colors of the various shapes in text mode."
   :group 'tetris
-  :type (let ((names `("Shape 1" "Shape 2" "Shape 3"
-		       "Shape 4" "Shape 5" "Shape 6" "Shape 7"))
-	      (result nil))
-	  (while names
-	    (add-to-list 'result
-			 (cons 'choice
-			       (cons :tag
-				     (cons (car names)
-					   (mapcar (lambda (color)
-						     (list 'const color))
-						   (defined-colors)))))
-			 t)
-	    (setq names (cdr names)))
-	  result))
+  :type '(vector (color :tag "Shape 1")
+		 (color :tag "Shape 2")
+		 (color :tag "Shape 3")
+		 (color :tag "Shape 4")
+		 (color :tag "Shape 5")
+		 (color :tag "Shape 6")
+		 (color :tag "Shape 7")))
 
 (defcustom tetris-x-colors
   [[0 0 1] [0.7 0 1] [1 1 0] [1 0 1] [0 1 1] [0 1 0] [1 0 0]]
diff --git a/lisp/progmodes/cpp.el b/lisp/progmodes/cpp.el
index 674d98b8dc..d332d8bff3 100644
--- a/lisp/progmodes/cpp.el
+++ b/lisp/progmodes/cpp.el
@@ -136,13 +136,18 @@ Each entry is a list with the following elements:
     ("true" . t)
     ("both" . both)))
 
+;; FIXME Gets clobbered by cpp-choose-face, so why is even it a defcustom?
 (defcustom cpp-face-default-list nil
   "Alist of faces you can choose from for cpp conditionals.
 Each element has the form (STRING . FACE), where STRING
 serves as a name (for `cpp-highlight-buffer' only)
 and FACE is either a face (a symbol)
 or a cons cell (background-color . COLOR)."
-  :type '(repeat (cons string (choice face (cons (const background-color) string))))
+  :type '(alist :key-type (string :tag "Name")
+		:value-type (choice face
+				    (const invisible)
+				    (cons (const background-color)
+					  (string :tag "Color"))))
   :group 'cpp)
 
 (defcustom cpp-face-light-name-list
diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el
index 0f92df95a9..0eb59bd06c 100644
--- a/lisp/progmodes/flymake.el
+++ b/lisp/progmodes/flymake.el
@@ -279,9 +279,24 @@ are the string substitutions (see `format')."
     ;; ("[ \t]*\\input[ \t]*{\\(.*\\)\\(%s\\)}" 1 2 ))
     ;; ("\\.tex\\'" 1)
     )
-  "Files syntax checking is allowed for."
+  "Files syntax checking is allowed for.
+This is an alist with elements of the form:
+  REGEXP INIT [CLEANUP [NAME]]
+REGEXP is a regular expression that matches a file name.
+INIT is the init function to use.
+CLEANUP is the cleanup function to use, default `flymake-simple-cleanup'.
+NAME is the file name function to use, default `flymake-get-real-file-name'."
   :group 'flymake
-  :type '(repeat (string symbol symbol symbol)))
+  :type '(alist :key-type (regexp :tag "File regexp")
+                :value-type
+                (list :tag "Handler functions"
+                      (function :tag "Init function")
+                      (choice :tag "Cleanup function"
+                              (const :tag "flymake-simple-cleanup" nil)
+                              function)
+                      (choice :tag "Name function"
+                              (const :tag "flymake-get-real-file-name" nil)
+                              function))))
 
 (defun flymake-get-file-name-mode-and-masks (file-name)
   "Return the corresponding entry from `flymake-allowed-file-name-masks'."
diff --git a/lisp/progmodes/idlw-help.el b/lisp/progmodes/idlw-help.el
index 749b0b6557..b46b16aa87 100644
--- a/lisp/progmodes/idlw-help.el
+++ b/lisp/progmodes/idlw-help.el
@@ -90,16 +90,15 @@ Defaults to `browse-url-browser-function', which see."
 (defcustom idlwave-help-browser-generic-program browse-url-generic-program
   "Program to run if using `browse-url-generic-program'."
   :group 'idlwave-online-help
-  :type 'string)
-
-(defvar browse-url-generic-args)
+  :type '(choice (const nil) string))
 
+;; AFAICS, never used since it was introduced in 2004.
 (defcustom idlwave-help-browser-generic-args
   (if (boundp 'browse-url-generic-args)
       browse-url-generic-args "")
   "Program args to use if using `browse-url-generic-program'."
   :group 'idlwave-online-help
-  :type 'string)
+  :type '(repeat string))
 
 (defcustom idlwave-help-browser-is-local nil
   "Whether the browser will display locally in an Emacs window.
diff --git a/lisp/progmodes/make-mode.el b/lisp/progmodes/make-mode.el
index 20673866bc..3069c790e1 100644
--- a/lisp/progmodes/make-mode.el
+++ b/lisp/progmodes/make-mode.el
@@ -241,7 +241,7 @@ to MODIFY A FILE WITHOUT YOUR CONFIRMATION when \"it seems necessary\"."
   "List of special targets.
 You will be offered to complete on one of those in the minibuffer whenever
 you enter a \".\" at the beginning of a line in `makefile-mode'."
-  :type '(repeat (list string))
+  :type '(repeat string)
   :group 'makefile)
 (put 'makefile-special-targets-list 'risky-local-variable t)
 
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 2165c83505..641563ae0a 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -1681,7 +1681,7 @@ This variable, when set to a string, makes the values stored in
 `python-shell-process-environment' and `python-shell-exec-path'
 to be modified properly so shells are started with the specified
 virtualenv."
-  :type 'string
+  :type '(choice (const nil) string)
   :group 'python
   :safe 'stringp)
 
diff --git a/lisp/progmodes/verilog-mode.el b/lisp/progmodes/verilog-mode.el
index 60a2cf55f3..b36c6d0275 100644
--- a/lisp/progmodes/verilog-mode.el
+++ b/lisp/progmodes/verilog-mode.el
@@ -964,7 +964,7 @@ See also `verilog-library-flags', `verilog-library-directories'."
 This is used for AUTORESET and AUTOTIEOFF.  For proper behavior,
 you will probably also need `verilog-auto-reset-widths' set."
   :group 'verilog-mode-auto
-  :type 'string)
+  :type '(choice (const nil) regexp))
 (put 'verilog-active-low-regexp 'safe-local-variable 'stringp)
 
 (defcustom verilog-auto-sense-include-inputs nil
@@ -1138,21 +1138,21 @@ won't merge conflict."
   "If set, when creating AUTOINPUT list, ignore signals matching this regexp.
 See the \\[verilog-faq] for examples on using this."
   :group 'verilog-mode-auto
-  :type 'string)
+  :type '(choice (const nil) regexp))
 (put 'verilog-auto-input-ignore-regexp 'safe-local-variable 'stringp)
 
 (defcustom verilog-auto-inout-ignore-regexp nil
   "If set, when creating AUTOINOUT list, ignore signals matching this regexp.
 See the \\[verilog-faq] for examples on using this."
   :group 'verilog-mode-auto
-  :type 'string)
+  :type '(choice (const nil) regexp))
 (put 'verilog-auto-inout-ignore-regexp 'safe-local-variable 'stringp)
 
 (defcustom verilog-auto-output-ignore-regexp nil
   "If set, when creating AUTOOUTPUT list, ignore signals matching this regexp.
 See the \\[verilog-faq] for examples on using this."
   :group 'verilog-mode-auto
-  :type 'string)
+  :type '(choice (const nil) regexp))
 (put 'verilog-auto-output-ignore-regexp 'safe-local-variable 'stringp)
 
 (defcustom verilog-auto-template-warn-unused nil
@@ -1176,21 +1176,21 @@ assignment, else the data type for variable creation."
   "If set, when creating AUTOTIEOFF list, ignore signals matching this regexp.
 See the \\[verilog-faq] for examples on using this."
   :group 'verilog-mode-auto
-  :type 'string)
+  :type '(choice (const nil) regexp))
 (put 'verilog-auto-tieoff-ignore-regexp 'safe-local-variable 'stringp)
 
 (defcustom verilog-auto-unused-ignore-regexp nil
   "If set, when creating AUTOUNUSED list, ignore signals matching this regexp.
 See the \\[verilog-faq] for examples on using this."
   :group 'verilog-mode-auto
-  :type 'string)
+  :type '(choice (const nil) regexp))
 (put 'verilog-auto-unused-ignore-regexp 'safe-local-variable 'stringp)
 
 (defcustom verilog-typedef-regexp nil
   "If non-nil, regular expression that matches Verilog-2001 typedef names.
 For example, \"_t$\" matches typedefs named with _t, as in the C language."
   :group 'verilog-mode-auto
-  :type 'string)
+  :type '(choice (const nil) regexp))
 (put 'verilog-typedef-regexp 'safe-local-variable 'stringp)
 
 (defcustom verilog-mode-hook   'verilog-set-compile-command
diff --git a/lisp/ps-mule.el b/lisp/ps-mule.el
index 4da5d1db24..059261ac0a 100644
--- a/lisp/ps-mule.el
+++ b/lisp/ps-mule.el
@@ -188,7 +188,32 @@ See also the variable `ps-font-info-database'.")
 (defcustom ps-mule-font-info-database-default
   ps-mule-font-info-database-latin
   "The default setting to use when `ps-multibyte-buffer' is nil."
-  :type '(symbol :tag "Multi-Byte Buffer Database Font Default")
+  :type '(alist :key-type symbol :tag "Charset"
+		:value-type
+		(list (list
+		       (choice :tag "Font type"
+			       (const normal)
+			       (const bold)
+			       (const italic)
+			       (const bold-italic))
+		       (choice :tag "Font source"
+			       (const builtin)
+			       (const bdf)
+			       (const vflib)
+			       (const nil))
+		       ;; My guess as to what the doc is trying to say...
+		       (choice :tag "Font name"
+			       (const nil)
+			       string
+			       (repeat :tag "List" string))
+		       (choice :tag "Encoding"
+			       (const nil)
+			       coding-system
+			       function)
+		       (choice :tag "Bytes"
+			       (const nil)
+			       (const 1)
+			       (const 2)))))
   :group 'ps-print-font)
 
 (defconst ps-mule-font-info-database-ps
diff --git a/lisp/ps-print.el b/lisp/ps-print.el
index f7c03c2de8..b5961064cb 100644
--- a/lisp/ps-print.el
+++ b/lisp/ps-print.el
@@ -3017,7 +3017,6 @@ Any other value is ignored and black color will be used.
 This variable is used only when `ps-print-color-p' (which see) is neither nil
 nor black-white."
   :type '(choice :menu-tag "Default Foreground Gray/Color"
-		 :tag "Default Foreground Gray/Color"
 		 (const :tag "Session Foreground" t)
 		 (const :tag "Frame Foreground" frame-parameter)
 		 (number :tag "Gray Scale" :value 0.0)
@@ -3025,7 +3024,8 @@ nor black-white."
 		 (list :tag "RGB Color" :value (0.0 0.0 0.0)
 		       (number :tag "Red")
 		       (number :tag "Green")
-		       (number :tag "Blue")))
+		       (number :tag "Blue"))
+		 (other :tag "Default Foreground Gray/Color" nil))
   :version "20"
   :group 'ps-print-color)
 
@@ -3063,7 +3063,6 @@ nor black-white.
 
 See also `ps-use-face-background'."
   :type '(choice :menu-tag "Default Background Gray/Color"
-		 :tag "Default Background Gray/Color"
 		 (const :tag "Session Background" t)
 		 (const :tag "Frame Background" frame-parameter)
 		 (number :tag "Gray Scale" :value 1.0)
@@ -3071,7 +3070,8 @@ See also `ps-use-face-background'."
 		 (list :tag "RGB Color" :value (1.0 1.0 1.0)
 		       (number :tag "Red")
 		       (number :tag "Green")
-		       (number :tag "Blue")))
+		       (number :tag "Blue"))
+		 (other :tag "Default Background Gray/Color" nil))
   :version "20"
   :group 'ps-print-color)
 
@@ -6658,7 +6658,7 @@ If FACE is not a valid face name, use default face."
 ;; But autoload them here to make the separation invisible.
 
 ;;;### (autoloads (ps-mule-end-job ps-mule-begin-job ps-mule-initialize
-;;;;;;  ps-multibyte-buffer) "ps-mule" "ps-mule.el" "1f436e4d78c7dc983a503dac18298515")
+;;;;;;  ps-multibyte-buffer) "ps-mule" "ps-mule.el" "b39f881d3a029049994ef6aa3de93c89")
 ;;; Generated autoloads from ps-mule.el
 
 (defvar ps-multibyte-buffer nil "\
diff --git a/lisp/textmodes/reftex-vars.el b/lisp/textmodes/reftex-vars.el
index a68a27bb07..47bec5e721 100644
--- a/lisp/textmodes/reftex-vars.el
+++ b/lisp/textmodes/reftex-vars.el
@@ -932,7 +932,7 @@ The function will be called with two arguments, the LABEL and the DEFAULT
 FORMAT, which usually is `\\label{%s}'.  The function should return the
 string to insert into the buffer."
   :group 'reftex-making-and-inserting-labels
-  :type 'function)
+  :type '(choice (const nil) function))
 
 ;; Label referencing
 
diff --git a/lisp/textmodes/remember.el b/lisp/textmodes/remember.el
index c8bafd8176..5782f25e48 100644
--- a/lisp/textmodes/remember.el
+++ b/lisp/textmodes/remember.el
@@ -481,7 +481,7 @@ Most useful for remembering things from other applications."
 (defcustom remember-diary-file nil
   "File for extracted diary entries.
 If this is nil, then `diary-file' will be used instead."
-  :type 'file
+  :type '(choice (const :tag "diary-file" nil) file)
   :group 'remember)
 
 (defun remember-diary-convert-entry (entry)
diff --git a/lisp/type-break.el b/lisp/type-break.el
index 3ddf2e2d20..e4fa02f9fe 100644
--- a/lisp/type-break.el
+++ b/lisp/type-break.el
@@ -95,7 +95,7 @@ When this variable is non-nil, its value is considered to be a \"good\"
 length (in seconds) for a break initiated by the command `type-break',
 overriding `type-break-good-rest-interval'.  This provides querying of
 break interruptions when `type-break-good-rest-interval' is nil."
-  :type 'integer
+  :type '(choice (const nil) integer)
   :group 'type-break)
 
 (defcustom type-break-keystroke-threshold
diff --git a/lisp/whitespace.el b/lisp/whitespace.el
index 68625e06ac..801cdc5204 100644
--- a/lisp/whitespace.el
+++ b/lisp/whitespace.el
@@ -803,8 +803,8 @@ and the cons cdr is used for TABs visualization.
 
 Used when `whitespace-style' includes `indentation',
 `indentation::tab' or  `indentation::space'."
-  :type '(cons (regexp :tag "Indentation SPACEs")
-	       (regexp :tag "Indentation TABs"))
+  :type '(cons (string :tag "Indentation SPACEs")
+	       (string :tag "Indentation TABs"))
   :group 'whitespace)
 
 
@@ -834,7 +834,8 @@ and the cons cdr is used for TABs visualization.
 
 Used when `whitespace-style' includes `space-after-tab',
 `space-after-tab::tab' or `space-after-tab::space'."
-  :type '(regexp :tag "SPACEs After TAB")
+  :type '(cons (string :tag "SPACEs After TAB")
+	       string)
   :group 'whitespace)