[Emacs-diffs] feature/bignum 45eb3b3 22/24: Use fixnump rather than integerp in some spots

[Tom Tromey]

branch: feature/bignum
commit 45eb3b3513619d97d046a8efbe0d16fafc75a734
Author: Tom Tromey <address@hidden>
Commit: Tom Tromey <address@hidden>

    Use fixnump rather than integerp in some spots
    
    * src/buffer.c (syms_of_buffer): Use Qfixnump, not Qintegerp.
    * src/data.c (syms_of_data): Define fixnump symbol.
    * src/lisp.h (lisp_h_CHECK_FIXNUM): Use Qfixnump.
    (struct Lisp_Buffer_Objfwd): Update comment.
---
 src/buffer.c | 22 +++++++++++-----------
 src/data.c   |  1 +
 src/lisp.h   |  4 ++--
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/buffer.c b/src/buffer.c
index 2924885..2a165c5 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -5584,17 +5584,17 @@ Use the command `abbrev-mode' to change this variable.  
*/);
                     doc: /* Non-nil if searches and matches should ignore 
case.  */);
 
   DEFVAR_PER_BUFFER ("fill-column", &BVAR (current_buffer, fill_column),
-                    Qintegerp,
+                    Qfixnump,
                     doc: /* Column beyond which automatic line-wrapping should 
happen.
 Interactively, you can set the buffer local value using \\[set-fill-column].  
*/);
 
   DEFVAR_PER_BUFFER ("left-margin", &BVAR (current_buffer, left_margin),
-                    Qintegerp,
+                    Qfixnump,
                     doc: /* Column for the default `indent-line-function' to 
indent to.
 Linefeed indents to this column in Fundamental mode.  */);
 
   DEFVAR_PER_BUFFER ("tab-width", &BVAR (current_buffer, tab_width),
-                    Qintegerp,
+                    Qfixnump,
                     doc: /* Distance between tab stops (for display of tab 
characters), in columns.
 NOTE: This controls the display width of a TAB character, and not
 the size of an indentation step.
@@ -5765,7 +5765,7 @@ If it is nil, that means don't auto-save this buffer.  
*/);
 Backing up is done before the first time the file is saved.  */);
 
   DEFVAR_PER_BUFFER ("buffer-saved-size", &BVAR (current_buffer, save_length),
-                    Qintegerp,
+                    Qfixnump,
                     doc: /* Length of current buffer when last read in, saved 
or auto-saved.
 0 initially.
 -1 means auto-saving turned off until next real save.
@@ -5839,7 +5839,7 @@ In addition, a char-table has six extra slots to control 
the display of:
 See also the functions `display-table-slot' and `set-display-table-slot'.  */);
 
   DEFVAR_PER_BUFFER ("left-margin-width", &BVAR (current_buffer, 
left_margin_cols),
-                    Qintegerp,
+                    Qfixnump,
                     doc: /* Width in columns of left marginal area for display 
of a buffer.
 A value of nil means no marginal area.
 
@@ -5847,7 +5847,7 @@ Setting this variable does not take effect until a new 
buffer is displayed
 in a window.  To make the change take effect, call `set-window-buffer'.  */);
 
   DEFVAR_PER_BUFFER ("right-margin-width", &BVAR (current_buffer, 
right_margin_cols),
-                    Qintegerp,
+                    Qfixnump,
                     doc: /* Width in columns of right marginal area for 
display of a buffer.
 A value of nil means no marginal area.
 
@@ -5855,7 +5855,7 @@ Setting this variable does not take effect until a new 
buffer is displayed
 in a window.  To make the change take effect, call `set-window-buffer'.  */);
 
   DEFVAR_PER_BUFFER ("left-fringe-width", &BVAR (current_buffer, 
left_fringe_width),
-                    Qintegerp,
+                    Qfixnump,
                     doc: /* Width of this buffer's left fringe (in pixels).
 A value of 0 means no left fringe is shown in this buffer's window.
 A value of nil means to use the left fringe width from the window's frame.
@@ -5864,7 +5864,7 @@ Setting this variable does not take effect until a new 
buffer is displayed
 in a window.  To make the change take effect, call `set-window-buffer'.  */);
 
   DEFVAR_PER_BUFFER ("right-fringe-width", &BVAR (current_buffer, 
right_fringe_width),
-                    Qintegerp,
+                    Qfixnump,
                     doc: /* Width of this buffer's right fringe (in pixels).
 A value of 0 means no right fringe is shown in this buffer's window.
 A value of nil means to use the right fringe width from the window's frame.
@@ -5881,12 +5881,12 @@ Setting this variable does not take effect until a new 
buffer is displayed
 in a window.  To make the change take effect, call `set-window-buffer'.  */);
 
   DEFVAR_PER_BUFFER ("scroll-bar-width", &BVAR (current_buffer, 
scroll_bar_width),
-                    Qintegerp,
+                    Qfixnump,
                     doc: /* Width of this buffer's vertical scroll bars in 
pixels.
 A value of nil means to use the scroll bar width from the window's frame.  */);
 
   DEFVAR_PER_BUFFER ("scroll-bar-height", &BVAR (current_buffer, 
scroll_bar_height),
-                    Qintegerp,
+                    Qfixnump,
                     doc: /* Height of this buffer's horizontal scroll bars in 
pixels.
 A value of nil means to use the scroll bar height from the window's frame.  
*/);
 
@@ -6156,7 +6156,7 @@ Setting this variable is very fast, much faster than 
scanning all the text in
 the buffer looking for properties to change.  */);
 
   DEFVAR_PER_BUFFER ("buffer-display-count",
-                    &BVAR (current_buffer, display_count), Qintegerp,
+                    &BVAR (current_buffer, display_count), Qfixnump,
                     doc: /* A number incremented each time this buffer is 
displayed in a window.
 The function `set-window-buffer' increments it.  */);
 
diff --git a/src/data.c b/src/data.c
index 8a2d600..8623812 100644
--- a/src/data.c
+++ b/src/data.c
@@ -3921,6 +3921,7 @@ syms_of_data (void)
   DEFSYM (Qlistp, "listp");
   DEFSYM (Qconsp, "consp");
   DEFSYM (Qsymbolp, "symbolp");
+  DEFSYM (Qfixnump, "fixnump");
   DEFSYM (Qintegerp, "integerp");
   DEFSYM (Qnatnump, "natnump");
   DEFSYM (Qwholenump, "wholenump");
diff --git a/src/lisp.h b/src/lisp.h
index 846e955..e046429 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -357,7 +357,7 @@ typedef EMACS_INT Lisp_Word;
 # endif
 #endif
 
-#define lisp_h_CHECK_FIXNUM(x) CHECK_TYPE (FIXNUMP (x), Qintegerp, x)
+#define lisp_h_CHECK_FIXNUM(x) CHECK_TYPE (FIXNUMP (x), Qfixnump, x)
 #define lisp_h_CHECK_SYMBOL(x) CHECK_TYPE (SYMBOLP (x), Qsymbolp, x)
 #define lisp_h_CHECK_TYPE(ok, predicate, x) \
    ((ok) ? (void) 0 : wrong_type_argument (predicate, x))
@@ -2590,7 +2590,7 @@ struct Lisp_Buffer_Objfwd
   {
     enum Lisp_Fwd_Type type;   /* = Lisp_Fwd_Buffer_Obj */
     int offset;
-    /* One of Qnil, Qintegerp, Qsymbolp, Qstringp, Qfloatp or Qnumberp.  */
+    /* One of Qnil, Qfixnump, Qsymbolp, Qstringp, Qfloatp or Qnumberp.  */
     Lisp_Object predicate;
   };