aboutsummaryrefslogtreecommitdiffstats
path: root/src/fringe.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/fringe.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/fringe.c')
-rw-r--r--src/fringe.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/fringe.c b/src/fringe.c
index c1784c01b9e..583bba4e510 100644
--- a/src/fringe.c
+++ b/src/fringe.c
@@ -491,7 +491,7 @@ lookup_fringe_bitmap (Lisp_Object bitmap)
491 if (!FIXNUMP (bitmap)) 491 if (!FIXNUMP (bitmap))
492 return 0; 492 return 0;
493 493
494 bn = XINT (bitmap); 494 bn = XFIXNUM (bitmap);
495 if (bn > NO_FRINGE_BITMAP 495 if (bn > NO_FRINGE_BITMAP
496 && bn < max_used_fringe_bitmap 496 && bn < max_used_fringe_bitmap
497 && (bn < MAX_STANDARD_FRINGE_BITMAPS 497 && (bn < MAX_STANDARD_FRINGE_BITMAPS
@@ -743,7 +743,7 @@ get_logical_fringe_bitmap (struct window *w, Lisp_Object bitmap, int right_p, in
743 return NO_FRINGE_BITMAP; 743 return NO_FRINGE_BITMAP;
744 if (CONSP (bm1)) 744 if (CONSP (bm1))
745 { 745 {
746 ln1 = XINT (Flength (bm1)); 746 ln1 = XFIXNUM (Flength (bm1));
747 if (partial_p) 747 if (partial_p)
748 { 748 {
749 if (ln1 > ix2) 749 if (ln1 > ix2)
@@ -778,7 +778,7 @@ get_logical_fringe_bitmap (struct window *w, Lisp_Object bitmap, int right_p, in
778 { 778 {
779 if (CONSP (bm2)) 779 if (CONSP (bm2))
780 { 780 {
781 ln2 = XINT (Flength (bm2)); 781 ln2 = XFIXNUM (Flength (bm2));
782 if (partial_p) 782 if (partial_p)
783 { 783 {
784 if (ln2 > ix2) 784 if (ln2 > ix2)
@@ -1510,7 +1510,7 @@ If BITMAP already exists, the existing definition is replaced. */)
1510 else 1510 else
1511 { 1511 {
1512 CHECK_FIXNUM (height); 1512 CHECK_FIXNUM (height);
1513 fb.height = max (0, min (XINT (height), 255)); 1513 fb.height = max (0, min (XFIXNUM (height), 255));
1514 if (fb.height > h) 1514 if (fb.height > h)
1515 { 1515 {
1516 fill1 = (fb.height - h) / 2; 1516 fill1 = (fb.height - h) / 2;
@@ -1523,7 +1523,7 @@ If BITMAP already exists, the existing definition is replaced. */)
1523 else 1523 else
1524 { 1524 {
1525 CHECK_FIXNUM (width); 1525 CHECK_FIXNUM (width);
1526 fb.width = max (0, min (XINT (width), 255)); 1526 fb.width = max (0, min (XFIXNUM (width), 255));
1527 } 1527 }
1528 1528
1529 fb.period = 0; 1529 fb.period = 0;
@@ -1605,7 +1605,7 @@ If BITMAP already exists, the existing definition is replaced. */)
1605 for (i = 0; i < h && j < fb.height; i++) 1605 for (i = 0; i < h && j < fb.height; i++)
1606 { 1606 {
1607 Lisp_Object elt = Faref (bits, make_fixnum (i)); 1607 Lisp_Object elt = Faref (bits, make_fixnum (i));
1608 b[j++] = FIXED_OR_FLOATP (elt) ? XINT (elt) : 0; 1608 b[j++] = FIXED_OR_FLOATP (elt) ? XFIXNUM (elt) : 0;
1609 } 1609 }
1610 for (i = 0; i < fill2 && j < fb.height; i++) 1610 for (i = 0; i < fill2 && j < fb.height; i++)
1611 b[j++] = 0; 1611 b[j++] = 0;
@@ -1662,9 +1662,9 @@ Return nil if POS is not visible in WINDOW. */)
1662 if (!NILP (pos)) 1662 if (!NILP (pos))
1663 { 1663 {
1664 CHECK_FIXNUM_COERCE_MARKER (pos); 1664 CHECK_FIXNUM_COERCE_MARKER (pos);
1665 if (! (BEGV <= XINT (pos) && XINT (pos) <= ZV)) 1665 if (! (BEGV <= XFIXNUM (pos) && XFIXNUM (pos) <= ZV))
1666 args_out_of_range (window, pos); 1666 args_out_of_range (window, pos);
1667 textpos = XINT (pos); 1667 textpos = XFIXNUM (pos);
1668 } 1668 }
1669 else if (w == XWINDOW (selected_window)) 1669 else if (w == XWINDOW (selected_window))
1670 textpos = PT; 1670 textpos = PT;