[Emacs-diffs] trunk r113833: Fix some custom types

[Glenn Morris]

------------------------------------------------------------
revno: 113833
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2013-08-13 00:42:51 -0700
message:
  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.
modified:
  admin/cus-test.el              custest.el-20091113204419-o5vbwnq5f7feedwu-2466
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/cus-start.el              
cusstart.el-20091113204419-o5vbwnq5f7feedwu-1100
  lisp/emulation/viper-init.el   
viperinit.el-20091113204419-o5vbwnq5f7feedwu-1181
  lisp/mail/feedmail.el          
feedmail.el-20091113204419-o5vbwnq5f7feedwu-1281

=== modified file 'admin/cus-test.el'
--- a/admin/cus-test.el 2013-05-16 00:20:34 +0000
+++ b/admin/cus-test.el 2013-08-13 07:42:51 +0000
@@ -202,6 +202,8 @@
 
           ;; 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)

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-08-13 07:18:50 +0000
+++ b/lisp/ChangeLog    2013-08-13 07:42:51 +0000
@@ -1,5 +1,12 @@
 2013-08-13  Glenn Morris  <address@hidden>
 
+       * 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  <address@hidden>

=== modified file 'lisp/cus-start.el'
--- a/lisp/cus-start.el 2013-05-15 23:55:41 +0000
+++ b/lisp/cus-start.el 2013-08-13 07:42:51 +0000
@@ -457,7 +457,12 @@
             (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

=== modified file 'lisp/emulation/viper-init.el'
--- a/lisp/emulation/viper-init.el      2013-05-09 01:40:20 +0000
+++ b/lisp/emulation/viper-init.el      2013-08-13 07:42:51 +0000
@@ -690,7 +690,7 @@
 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

=== modified file 'lisp/mail/feedmail.el'
--- a/lisp/mail/feedmail.el     2013-05-21 07:25:14 +0000
+++ b/lisp/mail/feedmail.el     2013-08-13 07:42:51 +0000
@@ -407,8 +407,10 @@
 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 @@
 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 @@
 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