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.

diff --git a/admin/cus-test.el b/admin/cus-test.el
index 6b8ec9abe020cd69a5f3c53fcef94778b1bc32ca..54d26cc11d64306b3a0e186db24dfe21180339cb 100644 (file)
--- a/admin/cus-test.el
+++ b/admin/cus-test.el
@@ -202,6 +202,8 @@ The detected problematic options are stored in `cus-test-errors'."
 
           ;; Check the values
           (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)
                     (setq mismatch 'mismatch)))
                 values)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7951188bbaf82210ba56b1614929a07f966df100..a3b657b23ca23052fc532ff452915b77388c3768 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,12 @@
 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.
 
 2013-08-13  Stefan Monnier  <monnier@iro.umontreal.ca>

diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index cf94b6300ddecee1f06eee7fd0b87aa581d525f6..24f8ac3bade33f563dfdd4b028f012899f4dd564 100644 (file)
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -457,7 +457,12 @@ since it could result in memory overflow and make Emacs crash."
             (scroll-margin windows integer)
             (hscroll-margin windows integer "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)
             (mode-line-in-non-selected-windows mode-line boolean "22.1")
             (line-number-display-limit display

diff --git a/lisp/emulation/viper-init.el b/lisp/emulation/viper-init.el
index 76d4632f8c0c9026868f9b00be571ecdc5db3e2e..aa90344d195bbcd60708af142e57dd0f1de8fa96 100644 (file)
--- a/lisp/emulation/viper-init.el
+++ b/lisp/emulation/viper-init.el
@@ -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.
 If you want Viper search to behave as usual in Vi, set this variable to a
 negative number."
-  :type 'boolean
+  :type 'integer
   :group 'viper-search)
 
 (defcustom viper-re-query-replace t

diff --git a/lisp/mail/feedmail.el b/lisp/mail/feedmail.el
index 091b1a03025de6dc7ef4456c599be0b48bab1b7b..7f27599edf2242e91286e2b942a94ca550cf0dd8 100644 (file)
--- a/lisp/mail/feedmail.el
+++ b/lisp/mail/feedmail.el
@@ -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
 `feedmail-confirm-outgoing-timeout'."
   :group 'feedmail-misc
-  :type 'boolean
-  )
+  :type '(choice (const nil)
+                (const queued)
+                (const immediate)
+                (other t)))
 
 
 (defcustom feedmail-display-full-frame 'queued
@@ -425,8 +427,10 @@ it can still be interesting to see a lot about them as they are
 shuttled robotically onward."
   :version "24.1"
   :group 'feedmail-misc
-  :type 'boolean
-  )
+  :type '(choice (const nil)
+                (const queued)
+                (const immediate)
+                (other t)))
 
 
 (defcustom feedmail-confirm-outgoing-timeout nil
@@ -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
 delivery agent that processes the addresses backwards."
   :group 'feedmail-headers
-  :type 'boolean
-  )
+  :type '(choice (const nil)
+                (const first)
+                (const last)))
 
 
 (defcustom feedmail-fill-to-cc t