merge from trunk

5 files changed, 27 insertions, 8 deletions

diff --git a/admin/cus-test.el b/admin/cus-test.el
index 6b8ec9abe02..54d26cc11d6 100644
--- 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 7951188bbaf..a3b657b23ca 100644
--- 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 cf94b6300dd..24f8ac3bade 100644
--- 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 76d4632f8c0..aa90344d195 100644
--- 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 091b1a03025..7f27599edf2 100644
--- 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