aboutsummaryrefslogtreecommitdiffstats
path: root/src/intervals.c
diff options
context:
space:
mode:
authorTom Tromey2018-07-06 21:56:17 -0600
committerTom Tromey2018-07-12 22:12:27 -0600
commit42fe787b0f26c2df682b2797407a669ef8522ccb (patch)
treee944fe465e2b65703a8361bc82647faf4f7907f1 /src/intervals.c
parent01dbf2a347944497fdcf2ec156f4605020d7ba2a (diff)
downloademacs-42fe787b0f26c2df682b2797407a669ef8522ccb.tar.gz
emacs-42fe787b0f26c2df682b2797407a669ef8522ccb.zip
Rename integerp->fixnum, etc, in preparation for bignums
* src/json.c, src/keyboard.c, src/keyboard.h, src/keymap.c, src/kqueue.c, src/lcms.c, src/lisp.h, src/lread.c, src/macros.c, src/marker.c, src/menu.c, src/minibuf.c, src/msdos.c, src/print.c, src/process.c, src/profiler.c, src/search.c, src/sound.c, src/syntax.c, src/sysdep.c, src/term.c, src/terminal.c, src/textprop.c, src/undo.c, src/w16select.c, src/w32.c, src/w32console.c, src/w32cygwinx.c, src/w32fns.c, src/w32font.c, src/w32inevt.c, src/w32proc.c, src/w32select.c, src/w32term.c, src/w32uniscribe.c, src/widget.c, src/window.c, src/xdisp.c, src/xfaces.c, src/xfns.c, src/xfont.c, src/xftfont.c, src/xmenu.c, src/xrdb.c, src/xselect.c, src/xterm.c, src/xwidget.c: Rename INTEGERP->FIXNUM, make_number->make_fixnum, CHECK_NUMBER->CHECK_FIXNUM, make_natnum->make_fixed_natum, NUMBERP->FIXED_OR_FLOATP, NATNUMP->FIXNATP, CHECK_NATNUM->CHECK_FIXNAT.
Diffstat (limited to 'src/intervals.c')
-rw-r--r--src/intervals.c32
1 files changed, 16 insertions, 16 deletions
diff --git a/src/intervals.c b/src/intervals.c
index 4c624ea79c1..90ec4bd0537 100644
--- a/src/intervals.c
+++ b/src/intervals.c
@@ -1557,8 +1557,8 @@ graft_intervals_into_buffer (INTERVAL source, ptrdiff_t position,
1557 if (!inherit && tree && length > 0) 1557 if (!inherit && tree && length > 0)
1558 { 1558 {
1559 XSETBUFFER (buf, buffer); 1559 XSETBUFFER (buf, buffer);
1560 set_text_properties_1 (make_number (position), 1560 set_text_properties_1 (make_fixnum (position),
1561 make_number (position + length), 1561 make_fixnum (position + length),
1562 Qnil, buf, 1562 Qnil, buf,
1563 find_interval (tree, position)); 1563 find_interval (tree, position));
1564 } 1564 }
@@ -1793,7 +1793,7 @@ adjust_for_invis_intang (ptrdiff_t pos, ptrdiff_t test_offs, ptrdiff_t adj,
1793 /* POS + ADJ would be beyond the buffer bounds, so do no adjustment. */ 1793 /* POS + ADJ would be beyond the buffer bounds, so do no adjustment. */
1794 return pos; 1794 return pos;
1795 1795
1796 test_pos = make_number (pos + test_offs); 1796 test_pos = make_fixnum (pos + test_offs);
1797 1797
1798 invis_propval 1798 invis_propval
1799 = get_char_property_and_overlay (test_pos, Qinvisible, Qnil, 1799 = get_char_property_and_overlay (test_pos, Qinvisible, Qnil,
@@ -1806,7 +1806,7 @@ adjust_for_invis_intang (ptrdiff_t pos, ptrdiff_t test_offs, ptrdiff_t adj,
1806 such that an insertion at POS would inherit it. */ 1806 such that an insertion at POS would inherit it. */
1807 && (NILP (invis_overlay) 1807 && (NILP (invis_overlay)
1808 /* Invisible property is from a text-property. */ 1808 /* Invisible property is from a text-property. */
1809 ? (text_property_stickiness (Qinvisible, make_number (pos), Qnil) 1809 ? (text_property_stickiness (Qinvisible, make_fixnum (pos), Qnil)
1810 == (test_offs == 0 ? 1 : -1)) 1810 == (test_offs == 0 ? 1 : -1))
1811 /* Invisible property is from an overlay. */ 1811 /* Invisible property is from an overlay. */
1812 : (test_offs == 0 1812 : (test_offs == 0
@@ -1927,7 +1927,7 @@ set_point_both (ptrdiff_t charpos, ptrdiff_t bytepos)
1927 if (! NILP (intangible_propval)) 1927 if (! NILP (intangible_propval))
1928 { 1928 {
1929 while (XINT (pos) > BEGV 1929 while (XINT (pos) > BEGV
1930 && EQ (Fget_char_property (make_number (XINT (pos) - 1), 1930 && EQ (Fget_char_property (make_fixnum (XINT (pos) - 1),
1931 Qintangible, Qnil), 1931 Qintangible, Qnil),
1932 intangible_propval)) 1932 intangible_propval))
1933 pos = Fprevious_char_property_change (pos, Qnil); 1933 pos = Fprevious_char_property_change (pos, Qnil);
@@ -1954,7 +1954,7 @@ set_point_both (ptrdiff_t charpos, ptrdiff_t bytepos)
1954 /* If preceding char is intangible, 1954 /* If preceding char is intangible,
1955 skip forward over all chars with matching intangible property. */ 1955 skip forward over all chars with matching intangible property. */
1956 1956
1957 intangible_propval = Fget_char_property (make_number (charpos - 1), 1957 intangible_propval = Fget_char_property (make_fixnum (charpos - 1),
1958 Qintangible, Qnil); 1958 Qintangible, Qnil);
1959 1959
1960 if (! NILP (intangible_propval)) 1960 if (! NILP (intangible_propval))
@@ -2026,18 +2026,18 @@ set_point_both (ptrdiff_t charpos, ptrdiff_t bytepos)
2026 enter_after = Qnil; 2026 enter_after = Qnil;
2027 2027
2028 if (! EQ (leave_before, enter_before) && !NILP (leave_before)) 2028 if (! EQ (leave_before, enter_before) && !NILP (leave_before))
2029 call2 (leave_before, make_number (old_position), 2029 call2 (leave_before, make_fixnum (old_position),
2030 make_number (charpos)); 2030 make_fixnum (charpos));
2031 if (! EQ (leave_after, enter_after) && !NILP (leave_after)) 2031 if (! EQ (leave_after, enter_after) && !NILP (leave_after))
2032 call2 (leave_after, make_number (old_position), 2032 call2 (leave_after, make_fixnum (old_position),
2033 make_number (charpos)); 2033 make_fixnum (charpos));
2034 2034
2035 if (! EQ (enter_before, leave_before) && !NILP (enter_before)) 2035 if (! EQ (enter_before, leave_before) && !NILP (enter_before))
2036 call2 (enter_before, make_number (old_position), 2036 call2 (enter_before, make_fixnum (old_position),
2037 make_number (charpos)); 2037 make_fixnum (charpos));
2038 if (! EQ (enter_after, leave_after) && !NILP (enter_after)) 2038 if (! EQ (enter_after, leave_after) && !NILP (enter_after))
2039 call2 (enter_after, make_number (old_position), 2039 call2 (enter_after, make_fixnum (old_position),
2040 make_number (charpos)); 2040 make_fixnum (charpos));
2041 } 2041 }
2042} 2042}
2043 2043
@@ -2066,7 +2066,7 @@ move_if_not_intangible (ptrdiff_t position)
2066 skip back over all chars with matching intangible property. */ 2066 skip back over all chars with matching intangible property. */
2067 if (! NILP (intangible_propval)) 2067 if (! NILP (intangible_propval))
2068 while (XINT (pos) > BEGV 2068 while (XINT (pos) > BEGV
2069 && EQ (Fget_char_property (make_number (XINT (pos) - 1), 2069 && EQ (Fget_char_property (make_fixnum (XINT (pos) - 1),
2070 Qintangible, Qnil), 2070 Qintangible, Qnil),
2071 intangible_propval)) 2071 intangible_propval))
2072 pos = Fprevious_char_property_change (pos, Qnil); 2072 pos = Fprevious_char_property_change (pos, Qnil);
@@ -2075,7 +2075,7 @@ move_if_not_intangible (ptrdiff_t position)
2075 { 2075 {
2076 /* We want to move backward, so check the text after POSITION. */ 2076 /* We want to move backward, so check the text after POSITION. */
2077 2077
2078 intangible_propval = Fget_char_property (make_number (XINT (pos) - 1), 2078 intangible_propval = Fget_char_property (make_fixnum (XINT (pos) - 1),
2079 Qintangible, Qnil); 2079 Qintangible, Qnil);
2080 2080
2081 /* If following char is intangible, 2081 /* If following char is intangible,