Omit buffer_slot_type_mismatch and use generic predicates to enforce

the type of per-buffer values where appropriate.
* src/lisp.h (struct Lisp_Buffer_Objfwd): Rename slottype member to
predicate, which is how it's really used now.  Adjust comment.
* src/buffer.h (buffer_slot_type_mismatch): Remove prototype.
* src/buffer.c (buffer_slot_type_mismatch): Remove.
(DEFVAR_PER_BUFFER, defvar_per_buffer): Rename type argument to
predicate.  Adjust comment.
(syms_of_buffer): Use Qsymbolp for major-mode.  Use Qintegerp for
fill-column, left-margin, tab-width, buffer-saved-size,
left-margin-width, right-margin-width, left-fringe-width,
right-fringe-width, scroll-bar-width and buffer-display-count.
Use Qstringp for default-directory, buffer-file-name,
buffer-file-truename and buffer-auto-save-file-name.  Use Qfloatp for
scroll-up-aggressively and scroll-down-aggressively.  Use Qnumberp for
line-spacing.
* src/data.c (store_symval_forwarding): Adjust to call the predicate.
* lisp/cus-start.el (toplevel): Only allow float values for
scroll-up-aggressively and scroll-down-aggressively.
Allow any number for line-spacing.

2 files changed, 9 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8611edd3bfc..19968c46aa8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2013-01-10  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * cus-start.el (toplevel): Only allow float values for
+        scroll-up-aggressively and scroll-down-aggressively.
+        Allow any number for line-spacing.
+
 2013-01-10  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * doc-view.el (doc-view-pdfdraw-program): Allow "pdfdraw" name.
diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index 9d2c2750987..b954ed60baa 100644
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -115,12 +115,12 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
                             (const :tag "On the right" (down . right))))
                (other :tag "On left, no arrows" t)))
              (scroll-up-aggressively windows
-                                     (choice (const :tag "off" nil) number)
+                                     (choice (const :tag "off" nil) float)
                                      "21.1")
              (scroll-down-aggressively windows
-                                       (choice (const :tag "off" nil) number)
+                                       (choice (const :tag "off" nil) float)
                                        "21.1")
-             (line-spacing display (choice (const :tag "none" nil) integer)
+             (line-spacing display (choice (const :tag "none" nil) number)
                            "22.1")
              (cursor-in-non-selected-windows
               cursor boolean nil