aboutsummaryrefslogtreecommitdiffstats
path: root/src/intervals.c
diff options
context:
space:
mode:
authorTom Tromey2018-08-07 18:08:53 -0600
committerTom Tromey2018-08-07 18:08:53 -0600
commitd1ec3a0a8e4d7d56ebc1e4fa743130b9974ac6a8 (patch)
tree04c920acf142f686d3cac11080b17a2fb0dfc9af /src/intervals.c
parent68ebff23f7057090da260830500cb278f7b886a5 (diff)
downloademacs-d1ec3a0a8e4d7d56ebc1e4fa743130b9974ac6a8.tar.gz
emacs-d1ec3a0a8e4d7d56ebc1e4fa743130b9974ac6a8.zip
More macro renamings for bignum
* src/alloc.c, src/bidi.c, src/buffer.c, src/buffer.h, src/bytecode.c, src/callint.c, src/callproc.c, src/casefiddle.c, src/casetab.c, src/category.c, src/ccl.c, src/character.c, src/character.h, src/charset.c, src/charset.h, src/chartab.c, src/cmds.c, src/coding.c, src/composite.c, src/composite.h, src/data.c, src/dbusbind.c, src/decompress.c, src/dired.c, src/dispextern.h, src/dispnew.c, src/disptab.h, src/doc.c, src/dosfns.c, src/editfns.c, src/emacs-module.c, src/emacs.c, src/eval.c, src/fileio.c, src/floatfns.c, src/fns.c, src/font.c, src/font.h, src/fontset.c, src/frame.c, src/frame.h, src/fringe.c, src/ftcrfont.c, src/ftfont.c, src/gfilenotify.c, src/gnutls.c, src/gtkutil.c, src/image.c, src/indent.c, src/insdel.c, src/intervals.c, src/json.c, src/keyboard.c, 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/syntax.h, src/sysdep.c, src/term.c, src/termhooks.h, src/textprop.c, src/undo.c, src/w32.c, src/w32console.c, src/w32fns.c, src/w32font.c, src/w32inevt.c, src/w32proc.c, src/w32select.c, src/w32term.c, src/w32term.h, src/w32uniscribe.c, src/window.c, src/xdisp.c, src/xfaces.c, src/xfns.c, src/xfont.c, src/xftfont.c, src/xmenu.c, src/xml.c, src/xrdb.c, src/xselect.c, src/xsettings.c, src/xterm.c, src/xwidget.c Rename XINT->XFIXNUM, XFASTINT->XFIXNAT, XUINT->XUFIXNUM.
Diffstat (limited to 'src/intervals.c')
-rw-r--r--src/intervals.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/intervals.c b/src/intervals.c
index 90ec4bd0537..af27afea0dc 100644
--- a/src/intervals.c
+++ b/src/intervals.c
@@ -1926,8 +1926,8 @@ set_point_both (ptrdiff_t charpos, ptrdiff_t bytepos)
1926 1926
1927 if (! NILP (intangible_propval)) 1927 if (! NILP (intangible_propval))
1928 { 1928 {
1929 while (XINT (pos) > BEGV 1929 while (XFIXNUM (pos) > BEGV
1930 && EQ (Fget_char_property (make_fixnum (XINT (pos) - 1), 1930 && EQ (Fget_char_property (make_fixnum (XFIXNUM (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);
@@ -1937,7 +1937,7 @@ set_point_both (ptrdiff_t charpos, ptrdiff_t bytepos)
1937 property is `front-sticky', perturb it to be one character 1937 property is `front-sticky', perturb it to be one character
1938 earlier -- this ensures that point can never move to the 1938 earlier -- this ensures that point can never move to the
1939 beginning of an invisible/intangible/front-sticky region. */ 1939 beginning of an invisible/intangible/front-sticky region. */
1940 charpos = adjust_for_invis_intang (XINT (pos), 0, -1, 0); 1940 charpos = adjust_for_invis_intang (XFIXNUM (pos), 0, -1, 0);
1941 } 1941 }
1942 } 1942 }
1943 else 1943 else
@@ -1959,7 +1959,7 @@ set_point_both (ptrdiff_t charpos, ptrdiff_t bytepos)
1959 1959
1960 if (! NILP (intangible_propval)) 1960 if (! NILP (intangible_propval))
1961 { 1961 {
1962 while (XINT (pos) < ZV 1962 while (XFIXNUM (pos) < ZV
1963 && EQ (Fget_char_property (pos, Qintangible, Qnil), 1963 && EQ (Fget_char_property (pos, Qintangible, Qnil),
1964 intangible_propval)) 1964 intangible_propval))
1965 pos = Fnext_char_property_change (pos, Qnil); 1965 pos = Fnext_char_property_change (pos, Qnil);
@@ -1969,7 +1969,7 @@ set_point_both (ptrdiff_t charpos, ptrdiff_t bytepos)
1969 property is `rear-sticky', perturb it to be one character 1969 property is `rear-sticky', perturb it to be one character
1970 later -- this ensures that point can never move to the 1970 later -- this ensures that point can never move to the
1971 end of an invisible/intangible/rear-sticky region. */ 1971 end of an invisible/intangible/rear-sticky region. */
1972 charpos = adjust_for_invis_intang (XINT (pos), -1, 1, 0); 1972 charpos = adjust_for_invis_intang (XFIXNUM (pos), -1, 1, 0);
1973 } 1973 }
1974 } 1974 }
1975 1975
@@ -2055,7 +2055,7 @@ move_if_not_intangible (ptrdiff_t position)
2055 if (! NILP (Vinhibit_point_motion_hooks)) 2055 if (! NILP (Vinhibit_point_motion_hooks))
2056 /* If intangible is inhibited, always move point to POSITION. */ 2056 /* If intangible is inhibited, always move point to POSITION. */
2057 ; 2057 ;
2058 else if (PT < position && XINT (pos) < ZV) 2058 else if (PT < position && XFIXNUM (pos) < ZV)
2059 { 2059 {
2060 /* We want to move forward, so check the text before POSITION. */ 2060 /* We want to move forward, so check the text before POSITION. */
2061 2061
@@ -2065,23 +2065,23 @@ move_if_not_intangible (ptrdiff_t position)
2065 /* If following char is intangible, 2065 /* If following char is intangible,
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 (XFIXNUM (pos) > BEGV
2069 && EQ (Fget_char_property (make_fixnum (XINT (pos) - 1), 2069 && EQ (Fget_char_property (make_fixnum (XFIXNUM (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);
2073 } 2073 }
2074 else if (XINT (pos) > BEGV) 2074 else if (XFIXNUM (pos) > BEGV)
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_fixnum (XINT (pos) - 1), 2078 intangible_propval = Fget_char_property (make_fixnum (XFIXNUM (pos) - 1),
2079 Qintangible, Qnil); 2079 Qintangible, Qnil);
2080 2080
2081 /* If following char is intangible, 2081 /* If following char is intangible,
2082 skip forward over all chars with matching intangible property. */ 2082 skip forward over all chars with matching intangible property. */
2083 if (! NILP (intangible_propval)) 2083 if (! NILP (intangible_propval))
2084 while (XINT (pos) < ZV 2084 while (XFIXNUM (pos) < ZV
2085 && EQ (Fget_char_property (pos, Qintangible, Qnil), 2085 && EQ (Fget_char_property (pos, Qintangible, Qnil),
2086 intangible_propval)) 2086 intangible_propval))
2087 pos = Fnext_char_property_change (pos, Qnil); 2087 pos = Fnext_char_property_change (pos, Qnil);
@@ -2096,7 +2096,7 @@ move_if_not_intangible (ptrdiff_t position)
2096 try moving to POSITION (which means we actually move farther 2096 try moving to POSITION (which means we actually move farther
2097 if POSITION is inside of intangible text). */ 2097 if POSITION is inside of intangible text). */
2098 2098
2099 if (XINT (pos) != PT) 2099 if (XFIXNUM (pos) != PT)
2100 SET_PT (position); 2100 SET_PT (position);
2101} 2101}
2102 2102