Commit f0024d8c authored by Glenn Morris's avatar Glenn Morris
Browse files

Fix some custom types

* lisp/cus-start.el (truncate-partial-width-windows): Fix type.

* lisp/emulation/viper-init.el (viper-search-scroll-threshold): Fix type.

* lisp/mail/feedmail.el (feedmail-confirm-outgoing)
(feedmail-display-full-frame, feedmail-deduce-bcc-where): Fix types.

* admin/admin.el: Related comments.
parent ae3f0661
...@@ -202,6 +202,8 @@ The detected problematic options are stored in `cus-test-errors'." ...@@ -202,6 +202,8 @@ The detected problematic options are stored in `cus-test-errors'."
;; Check the values ;; Check the values
(mapc (lambda (value) (mapc (lambda (value)
;; TODO for booleans, check for values that can be
;; evaluated and are not t or nil. Usually a bug.
(unless (widget-apply conv :match value) (unless (widget-apply conv :match value)
(setq mismatch 'mismatch))) (setq mismatch 'mismatch)))
values) values)
......
2013-08-13 Glenn Morris <rgm@gnu.org> 2013-08-13 Glenn Morris <rgm@gnu.org>
* mail/feedmail.el (feedmail-confirm-outgoing)
(feedmail-display-full-frame, feedmail-deduce-bcc-where): Fix types.
* cus-start.el (truncate-partial-width-windows): Fix type.
* emulation/viper-init.el (viper-search-scroll-threshold): Fix type.
* net/shr.el (shr-table-horizontal-line): Fix custom type. * net/shr.el (shr-table-horizontal-line): Fix custom type.
2013-08-13 Stefan Monnier <monnier@iro.umontreal.ca> 2013-08-13 Stefan Monnier <monnier@iro.umontreal.ca>
......
...@@ -457,7 +457,12 @@ since it could result in memory overflow and make Emacs crash." ...@@ -457,7 +457,12 @@ since it could result in memory overflow and make Emacs crash."
(scroll-margin windows integer) (scroll-margin windows integer)
(hscroll-margin windows integer "22.1") (hscroll-margin windows integer "22.1")
(hscroll-step windows number "22.1") (hscroll-step windows number "22.1")
(truncate-partial-width-windows display boolean "23.1") (truncate-partial-width-windows
display
(choice (integer :tag "Truncate if narrower than")
(const :tag "Respect `truncate-lines'" nil)
(other :tag "Truncate if not full-width" t))
"23.1")
(make-cursor-line-fully-visible windows boolean) (make-cursor-line-fully-visible windows boolean)
(mode-line-in-non-selected-windows mode-line boolean "22.1") (mode-line-in-non-selected-windows mode-line boolean "22.1")
(line-number-display-limit display (line-number-display-limit display
......
...@@ -690,7 +690,7 @@ to a new place after repeating previous Vi command." ...@@ -690,7 +690,7 @@ to a new place after repeating previous Vi command."
the window will be scrolled up or down appropriately, to reveal context. the window will be scrolled up or down appropriately, to reveal context.
If you want Viper search to behave as usual in Vi, set this variable to a If you want Viper search to behave as usual in Vi, set this variable to a
negative number." negative number."
:type 'boolean :type 'integer
:group 'viper-search) :group 'viper-search)
(defcustom viper-re-query-replace t (defcustom viper-re-query-replace t
......
...@@ -407,8 +407,10 @@ sending immediately. For any other non-nil value, prompt in both ...@@ -407,8 +407,10 @@ sending immediately. For any other non-nil value, prompt in both
cases. You can give a timeout for the prompt; see variable cases. You can give a timeout for the prompt; see variable
`feedmail-confirm-outgoing-timeout'." `feedmail-confirm-outgoing-timeout'."
:group 'feedmail-misc :group 'feedmail-misc
:type 'boolean :type '(choice (const nil)
) (const queued)
(const immediate)
(other t)))
(defcustom feedmail-display-full-frame 'queued (defcustom feedmail-display-full-frame 'queued
...@@ -425,8 +427,10 @@ it can still be interesting to see a lot about them as they are ...@@ -425,8 +427,10 @@ it can still be interesting to see a lot about them as they are
shuttled robotically onward." shuttled robotically onward."
:version "24.1" :version "24.1"
:group 'feedmail-misc :group 'feedmail-misc
:type 'boolean :type '(choice (const nil)
) (const queued)
(const immediate)
(other t)))
(defcustom feedmail-confirm-outgoing-timeout nil (defcustom feedmail-confirm-outgoing-timeout nil
...@@ -483,8 +487,9 @@ and serially, so slow SMTP conversations can add up to a delay. There ...@@ -483,8 +487,9 @@ and serially, so slow SMTP conversations can add up to a delay. There
is an option for either 'first or 'last because you might have a is an option for either 'first or 'last because you might have a
delivery agent that processes the addresses backwards." delivery agent that processes the addresses backwards."
:group 'feedmail-headers :group 'feedmail-headers
:type 'boolean :type '(choice (const nil)
) (const first)
(const last)))
(defcustom feedmail-fill-to-cc t (defcustom feedmail-fill-to-cc t
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment