Commit a931698a authored by Glenn Morris's avatar Glenn Morris

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.
parent e54eeb9b
2013-05-09 Glenn Morris <rgm@gnu.org> 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. * jka-cmpr-hook.el (jka-compr-mode-alist-additions): Fix typo.
Add :version. Add :version.
......
...@@ -170,7 +170,7 @@ A non-nil value may result in truncated bookmark names." ...@@ -170,7 +170,7 @@ A non-nil value may result in truncated bookmark names."
(defcustom bookmark-search-delay 0.2 (defcustom bookmark-search-delay 0.2
"Time before `bookmark-bmenu-search' updates the display." "Time before `bookmark-bmenu-search' updates the display."
:group 'bookmark :group 'bookmark
:type 'integer) :type 'number)
(defface bookmark-menu-heading (defface bookmark-menu-heading
'((t (:inherit font-lock-type-face))) '((t (:inherit font-lock-type-face)))
......
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> 2013-04-27 David Engster <deng@randomsample.de>
* semantic/complete.el * semantic/complete.el
......
...@@ -130,12 +130,12 @@ ...@@ -130,12 +130,12 @@
(declare-function ede-current-project "ede") (declare-function ede-current-project "ede")
(defvar semanticdb-find-throttle-custom-list (defvar semanticdb-find-throttle-custom-list
'(repeat (radio (const 'local) '(set (const local)
(const 'project) (const project)
(const 'unloaded) (const unloaded)
(const 'system) (const system)
(const 'recursive) (const recursive)
(const 'omniscience))) (const omniscience))
"Customization values for semanticdb find throttle. "Customization values for semanticdb find throttle.
See `semanticdb-find-throttle' for details.") See `semanticdb-find-throttle' for details.")
......
...@@ -252,7 +252,9 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of ...@@ -252,7 +252,9 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
(use-file-dialog menu boolean "22.1") (use-file-dialog menu boolean "22.1")
(focus-follows-mouse frames boolean "20.3") (focus-follows-mouse frames boolean "20.3")
;; fontset.c ;; 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 ;; frame.c
(default-frame-alist frames (default-frame-alist frames
(repeat (cons :format "%v" (repeat (cons :format "%v"
......
...@@ -100,14 +100,14 @@ current global map. The macro `lambda' is self-evaluating, hence always ...@@ -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 returns the same value (the function it defines may return varying values
when called)." when called)."
:group 'testcover :group 'testcover
:type 'hook) :type '(repeat symbol))
(defcustom testcover-noreturn-functions (defcustom testcover-noreturn-functions
'(error noreturn throw signal) '(error noreturn throw signal)
"Subset of `testcover-1value-functions' -- these never return. We mark "Subset of `testcover-1value-functions' -- these never return. We mark
them as having returned nil just before calling them." them as having returned nil just before calling them."
:group 'testcover :group 'testcover
:type 'hook) :type '(repeat symbol))
(defcustom testcover-compose-functions (defcustom testcover-compose-functions
'(+ - * / = append length list make-keymap make-sparse-keymap '(+ - * / = 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 ...@@ -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 call to one of the `testcover-1value-functions'. This list is probably
incomplete!" incomplete!"
:group 'testcover :group 'testcover
:type 'hook) :type '(repeat symbol))
(defcustom testcover-prog1-functions (defcustom testcover-prog1-functions
'(prog1 unwind-protect) '(prog1 unwind-protect)
...@@ -140,7 +140,7 @@ incomplete!" ...@@ -140,7 +140,7 @@ incomplete!"
brown splotch is shown for these if the first argument is a constant or a brown splotch is shown for these if the first argument is a constant or a
call to one of the `testcover-1value-functions'." call to one of the `testcover-1value-functions'."
:group 'testcover :group 'testcover
:type 'hook) :type '(repeat symbol))
(defcustom testcover-potentially-1value-functions (defcustom testcover-potentially-1value-functions
'(add-hook and beep or remove-hook unless when) '(add-hook and beep or remove-hook unless when)
......
...@@ -424,7 +424,7 @@ delete the text being replaced, as in standard Vi." ...@@ -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 "Magenta"
(defcustom viper-emacs-state-cursor-color nil (defcustom viper-emacs-state-cursor-color nil
"Cursor color when Viper is in Emacs state." "Cursor color when Viper is in Emacs state."
:type 'string :type '(choice (const nil) string)
:group 'viper) :group 'viper)
;; internal var, used to remember the default cursor color of emacs frames ;; internal var, used to remember the default cursor color of emacs frames
......
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> 2013-02-13 Aidan Gauland <aidalgol@no8wireless.co.nz>
* erc-match.el (erc-match-message): Fix last commit. * erc-match.el (erc-match-message): Fix last commit.
......
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
(defcustom erc-notifications-icon nil (defcustom erc-notifications-icon nil
"Icon to use for notification." "Icon to use for notification."
:group 'erc-notifications :group 'erc-notifications
:type 'file) :type '(choice (const :tag "No icon" nil) file))
(defun erc-notifications-notify (nick msg) (defun erc-notifications-notify (nick msg)
"Notify that NICK send some MSG. "Notify that NICK send some MSG.
......
...@@ -119,7 +119,8 @@ This option slows down recursive glob processing by quite a bit." ...@@ -119,7 +119,8 @@ This option slows down recursive glob processing by quite a bit."
"*" "+")) (+ pos 2)) "*" "+")) (+ pos 2))
(cons "*" (1+ pos)))))) (cons "*" (1+ pos))))))
"An alist for translation of extended globbing characters." "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) :group 'eshell-glob)
;;; Functions: ;;; Functions:
......
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> 2013-05-07 Katsumi Yamaoka <yamaoka@jpl.org>
* gnus-art.el (gnus-article-describe-bindings): Require help-mode * gnus-art.el (gnus-article-describe-bindings): Require help-mode
......
...@@ -1032,15 +1032,15 @@ Some of these headers are updated automatically. See ...@@ -1032,15 +1032,15 @@ Some of these headers are updated automatically. See
`gnus-article-update-date-headers' for details." `gnus-article-update-date-headers' for details."
:version "24.1" :version "24.1"
:group 'gnus-article-headers :group 'gnus-article-headers
:type '(repeat :type '(set
(item :tag "Universal time (UT)" :value 'ut) (const :tag "Universal time (UT)" ut)
(item :tag "Local time zone" :value 'local) (const :tag "Local time zone" local)
(item :tag "Readable English" :value 'english) (const :tag "Readable English" english)
(item :tag "Elapsed time" :value 'lapsed) (const :tag "Elapsed time" lapsed)
(item :tag "Original and elapsed time" :value 'combined-lapsed) (const :tag "Original and elapsed time" combined-lapsed)
(item :tag "Original date header" :value 'original) (const :tag "Original date header" original)
(item :tag "ISO8601 format" :value 'iso8601) (const :tag "ISO8601 format" iso8601)
(item :tag "User-defined" :value 'user-defined))) (const :tag "User-defined" user-defined)))
(defcustom gnus-article-update-date-headers nil (defcustom gnus-article-update-date-headers nil
"A number that says how often to update the date header (in seconds). "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 ...@@ -1651,7 +1651,7 @@ called with the group name as the parameter, and should return a
regexp." regexp."
:version "24.1" :version "24.1"
:group 'gnus-art :group 'gnus-art
:type 'regexp) :type '(choice regexp function))
;;; Internal variables ;;; Internal variables
......
...@@ -76,7 +76,7 @@ The function will be called narrowed to the region of the article ...@@ -76,7 +76,7 @@ The function will be called narrowed to the region of the article
that was fetched." that was fetched."
:version "24.1" :version "24.1"
:group 'gnus-asynchronous :group 'gnus-asynchronous
:type 'function) :type '(choice (const nil) function))
;;; Internal variables. ;;; Internal variables.
......
...@@ -35,13 +35,13 @@ ...@@ -35,13 +35,13 @@
(defcustom gnus-gravatar-size nil (defcustom gnus-gravatar-size nil
"How big should gravatars be displayed. "How big should gravatars be displayed.
If nil, default to `gravatar-size'." If nil, default to `gravatar-size'."
:type 'integer :type '(choice (const nil) integer)
:version "24.1" :version "24.1"
:group 'gnus-gravatar) :group 'gnus-gravatar)
(defcustom gnus-gravatar-properties '(:ascent center :relief 1) (defcustom gnus-gravatar-properties '(:ascent center :relief 1)
"List of image properties applied to Gravatar images." "List of image properties applied to Gravatar images."
:type 'list :type 'sexp
:version "24.1" :version "24.1"
:group 'gnus-gravatar) :group 'gnus-gravatar)
......
...@@ -45,7 +45,10 @@ ...@@ -45,7 +45,10 @@
"Time used to determine if we should use images from the cache." "Time used to determine if we should use images from the cache."
:version "24.1" :version "24.1"
:group 'gnus-art :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 (defcustom gnus-html-image-automatic-caching t
"Whether automatically cache retrieve images." "Whether automatically cache retrieve images."
......
...@@ -64,7 +64,8 @@ not get notifications." ...@@ -64,7 +64,8 @@ not get notifications."
(defcustom gnus-notifications-timeout nil (defcustom gnus-notifications-timeout nil
"Timeout used for notifications sent via `notifications-notify'." "Timeout used for notifications sent via `notifications-notify'."
:type 'integer :type '(choice (const :tag "Server default" nil)
(integer :tag "Milliseconds"))
:group 'gnus-notifications) :group 'gnus-notifications)
(defvar gnus-notifications-sent nil (defvar gnus-notifications-sent nil
......
...@@ -77,7 +77,7 @@ Some people may want to add \"unknown\" to this list." ...@@ -77,7 +77,7 @@ Some people may want to add \"unknown\" to this list."
(defcustom gnus-picon-properties '(:color-symbols (("None" . "white"))) (defcustom gnus-picon-properties '(:color-symbols (("None" . "white")))
"List of image properties applied to picons." "List of image properties applied to picons."
:type 'list :type 'sexp
:version "24.3" :version "24.3"
:group 'gnus-picon) :group 'gnus-picon)
......
...@@ -385,7 +385,7 @@ lines." ...@@ -385,7 +385,7 @@ lines."
integer) integer)
:group 'gnus-summary-tree) :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." "*Face used for highlighting selected articles in the thread tree."
:type 'face :type 'face
:group 'gnus-summary-tree) :group 'gnus-summary-tree)
......
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
"Value of `completion-styles' to use when completing." "Value of `completion-styles' to use when completing."
:version "24.1" :version "24.1"
:group 'gnus-meta :group 'gnus-meta
:type 'list) :type '(repeat symbol))
;; Fixme: this should be a gnus variable, not nnmail-. ;; Fixme: this should be a gnus variable, not nnmail-.
(defvar nnmail-pathname-coding-system) (defvar nnmail-pathname-coding-system)
......
...@@ -2507,6 +2507,7 @@ Disabling the agent may result in noticeable loss of performance." ...@@ -2507,6 +2507,7 @@ Disabling the agent may result in noticeable loss of performance."
:version "24.4" :version "24.4"
:group 'gnus-start :group 'gnus-start
:type '(choice (function-item gnus) :type '(choice (function-item gnus)
(function-item gnus-group-get-new-news)
(function-item gnus-no-server) (function-item gnus-no-server)
(function-item gnus-slave) (function-item gnus-slave)
(function-item gnus-slave-no-server))) (function-item gnus-slave-no-server)))
......
...@@ -527,7 +527,7 @@ If t, use `message-user-organization-file'." ...@@ -527,7 +527,7 @@ If t, use `message-user-organization-file'."
(setq orgfile f))) (setq orgfile f)))
orgfile) orgfile)
"*Local news organization file." "*Local news organization file."
:type 'file :type '(choice (const nil) file)
:link '(custom-manual "(message)News Headers") :link '(custom-manual "(message)News Headers")
:group 'message-headers) :group 'message-headers)
...@@ -1098,9 +1098,9 @@ e.g. using `gnus-posting-styles': ...@@ -1098,9 +1098,9 @@ e.g. using `gnus-posting-styles':
(eval (set (make-local-variable 'message-cite-reply-position) 'above))" (eval (set (make-local-variable 'message-cite-reply-position) 'above))"
:version "24.1" :version "24.1"
:type '(choice (const :tag "Reply inline" 'traditional) :type '(choice (const :tag "Reply inline" traditional)
(const :tag "Reply above" 'above) (const :tag "Reply above" above)
(const :tag "Reply below" 'below)) (const :tag "Reply below" below))
:group 'message-insertion) :group 'message-insertion)
(defcustom message-cite-style nil (defcustom message-cite-style nil
......
...@@ -326,7 +326,7 @@ with three items unique to nnir summary buffers: ...@@ -326,7 +326,7 @@ with three items unique to nnir summary buffers:
If nil this will use `gnus-summary-line-format'." If nil this will use `gnus-summary-line-format'."
:version "24.1" :version "24.1"
:type '(string) :type '(choice (const :tag "gnus-summary-line-format" nil) string)
:group 'nnir) :group 'nnir)
(defcustom nnir-retrieve-headers-override-function nil (defcustom nnir-retrieve-headers-override-function nil
...@@ -338,7 +338,7 @@ retrieved header format. ...@@ -338,7 +338,7 @@ retrieved header format.
If this variable is nil, or if the provided function returns nil for a search If this variable is nil, or if the provided function returns nil for a search
result, `gnus-retrieve-headers' will be called instead." result, `gnus-retrieve-headers' will be called instead."
:version "24.1" :version "24.1"
:type '(function) :type '(choice (const :tag "gnus-retrieve-headers" nil) function)
:group 'nnir) :group 'nnir)
(defcustom nnir-imap-default-search-key "whole message" (defcustom nnir-imap-default-search-key "whole message"
......
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
"Minimum luminance distance between two colors to be considered visible. "Minimum luminance distance between two colors to be considered visible.
Must be between 0 and 100." Must be between 0 and 100."
:group 'shr :group 'shr
:type 'float) :type 'number)
(defcustom shr-color-visible-distance-min 5 (defcustom shr-color-visible-distance-min 5
"Minimum color distance between two colors to be considered visible. "Minimum color distance between two colors to be considered visible.
......
...@@ -52,7 +52,7 @@ fit these criteria." ...@@ -52,7 +52,7 @@ fit these criteria."
"Images that have URLs matching this regexp will be blocked." "Images that have URLs matching this regexp will be blocked."
:version "24.1" :version "24.1"
:group 'shr :group 'shr
:type 'regexp) :type '(choice (const nil) regexp))
(defcustom shr-table-horizontal-line ?\s (defcustom shr-table-horizontal-line ?\s
"Character used to draw horizontal table lines." "Character used to draw horizontal table lines."
......
...@@ -81,7 +81,7 @@ The function must accept the arguments `host' and `report'." ...@@ -81,7 +81,7 @@ The function must accept the arguments `host' and `report'."
"Email address that spam articles are resent to when reporting. "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 If not set, the user will be prompted to enter a value which will be
saved for future use." saved for future use."
:type 'string :type '(choice (const :tag "Prompt" nil) string)
:group 'spam-report) :group 'spam-report)
(defvar spam-report-url-ping-temp-agent-function nil (defvar spam-report-url-ping-temp-agent-function nil
......
...@@ -94,14 +94,14 @@ Note that setting the `spam-use-move' or `spam-use-copy' backends on ...@@ -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." a group through group/topic parameters overrides this mechanism."
:type '(choice :type '(choice
(const (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 (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 (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) :group 'spam)
(defcustom spam-directory (nnheader-concat gnus-directory "spam/") (defcustom spam-directory (nnheader-concat gnus-directory "spam/")
......
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> 2013-05-08 Stefan Monnier <monnier@iro.umontreal.ca>
* mh-comp.el (mh-regexp-in-field-p): Minor simplification. * mh-comp.el (mh-regexp-in-field-p): Minor simplification.
......
...@@ -1354,7 +1354,7 @@ This option is consulted when a prefix argument is used with ...@@ -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 specified in the MH profile. This option may be used to provide
an alternate view. For example, \"'(\"-nolimit\" \"-textfield\" an alternate view. For example, \"'(\"-nolimit\" \"-textfield\"
\"subject\")\" is a useful setting." \"subject\")\" is a useful setting."
:type 'string :type '(repeat string)
:group 'mh-folder :group 'mh-folder
:package-version '(MH-E . "8.0")) :package-version '(MH-E . "8.0"))
...@@ -1368,7 +1368,7 @@ being refiled and point is at the start of the message. This function ...@@ -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 \"+\" 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 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." the default, or an empty string to suppress the default entirely."
:type 'function :type '(choice (const nil) function)
:group 'mh-folder-selection :group 'mh-folder-selection
:package-version '(MH-E . "8.0")) :package-version '(MH-E . "8.0"))
......
...@@ -77,20 +77,13 @@ If the return value is a number, it is used as the timer period." ...@@ -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"] ["blue" "white" "yellow" "magenta" "cyan" "green" "red"]
"Vector of colors of the various shapes in text mode." "Vector of colors of the various shapes in text mode."
:group 'tetris :group 'tetris
:type (let ((names `("Shape 1" "Shape 2" "Shape 3" :type '(vector (color :tag "Shape 1")
"Shape 4" "Shape 5" "Shape 6" "Shape 7")) (color :tag "Shape 2")
(result nil)) (color :tag "Shape 3")
(while names (color :tag "Shape 4")
(add-to-list 'result (color :tag "Shape 5")
(cons 'choice (color :tag "Shape 6")
(cons :tag (color :tag "Shape 7")))
(cons (car names)
(mapcar (lambda (color)
(list 'const color))
(defined-colors)))))