diff options
| author | Tom Tromey | 2018-08-07 18:08:53 -0600 |
|---|---|---|
| committer | Tom Tromey | 2018-08-07 18:08:53 -0600 |
| commit | d1ec3a0a8e4d7d56ebc1e4fa743130b9974ac6a8 (patch) | |
| tree | 04c920acf142f686d3cac11080b17a2fb0dfc9af /src/xselect.c | |
| parent | 68ebff23f7057090da260830500cb278f7b886a5 (diff) | |
| download | emacs-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/xselect.c')
| -rw-r--r-- | src/xselect.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/xselect.c b/src/xselect.c index d24a493294e..984d95d7483 100644 --- a/src/xselect.c +++ b/src/xselect.c | |||
| @@ -1693,7 +1693,7 @@ static unsigned long | |||
| 1693 | cons_to_x_long (Lisp_Object obj) | 1693 | cons_to_x_long (Lisp_Object obj) |
| 1694 | { | 1694 | { |
| 1695 | if (X_ULONG_MAX <= INTMAX_MAX | 1695 | if (X_ULONG_MAX <= INTMAX_MAX |
| 1696 | || XINT (FIXNUMP (obj) ? obj : XCAR (obj)) < 0) | 1696 | || XFIXNUM (FIXNUMP (obj) ? obj : XCAR (obj)) < 0) |
| 1697 | return cons_to_signed (obj, X_LONG_MIN, min (X_ULONG_MAX, INTMAX_MAX)); | 1697 | return cons_to_signed (obj, X_LONG_MIN, min (X_ULONG_MAX, INTMAX_MAX)); |
| 1698 | else | 1698 | else |
| 1699 | return cons_to_unsigned (obj, X_ULONG_MAX); | 1699 | return cons_to_unsigned (obj, X_ULONG_MAX); |
| @@ -1756,7 +1756,7 @@ lisp_data_to_selection_data (struct x_display_info *dpyinfo, | |||
| 1756 | cs->format = 16; | 1756 | cs->format = 16; |
| 1757 | cs->size = 1; | 1757 | cs->size = 1; |
| 1758 | cs->data[sizeof (short)] = 0; | 1758 | cs->data[sizeof (short)] = 0; |
| 1759 | *short_ptr = XINT (obj); | 1759 | *short_ptr = XFIXNUM (obj); |
| 1760 | if (NILP (type)) type = QINTEGER; | 1760 | if (NILP (type)) type = QINTEGER; |
| 1761 | } | 1761 | } |
| 1762 | else if (FIXNUMP (obj) | 1762 | else if (FIXNUMP (obj) |
| @@ -1832,7 +1832,7 @@ lisp_data_to_selection_data (struct x_display_info *dpyinfo, | |||
| 1832 | if (format == 32) | 1832 | if (format == 32) |
| 1833 | x_atoms[i] = cons_to_x_long (AREF (obj, i)); | 1833 | x_atoms[i] = cons_to_x_long (AREF (obj, i)); |
| 1834 | else | 1834 | else |
| 1835 | shorts[i] = XINT (AREF (obj, i)); | 1835 | shorts[i] = XFIXNUM (AREF (obj, i)); |
| 1836 | } | 1836 | } |
| 1837 | } | 1837 | } |
| 1838 | } | 1838 | } |
| @@ -1856,10 +1856,10 @@ clean_local_selection_data (Lisp_Object obj) | |||
| 1856 | && FIXNUMP (XCAR (obj)) | 1856 | && FIXNUMP (XCAR (obj)) |
| 1857 | && FIXNUMP (XCDR (obj))) | 1857 | && FIXNUMP (XCDR (obj))) |
| 1858 | { | 1858 | { |
| 1859 | if (XINT (XCAR (obj)) == 0) | 1859 | if (XFIXNUM (XCAR (obj)) == 0) |
| 1860 | return XCDR (obj); | 1860 | return XCDR (obj); |
| 1861 | if (XINT (XCAR (obj)) == -1) | 1861 | if (XFIXNUM (XCAR (obj)) == -1) |
| 1862 | return make_fixnum (- XINT (XCDR (obj))); | 1862 | return make_fixnum (- XFIXNUM (XCDR (obj))); |
| 1863 | } | 1863 | } |
| 1864 | if (VECTORP (obj)) | 1864 | if (VECTORP (obj)) |
| 1865 | { | 1865 | { |
| @@ -2313,8 +2313,8 @@ x_fill_property_data (Display *dpy, Lisp_Object data, void *ret, int format) | |||
| 2313 | For XDnd, v2 might be y of a window, and can be negative. | 2313 | For XDnd, v2 might be y of a window, and can be negative. |
| 2314 | The XDnd spec. is not explicit about negative values, | 2314 | The XDnd spec. is not explicit about negative values, |
| 2315 | but let's assume negative v2 is sent modulo 2**16. */ | 2315 | but let's assume negative v2 is sent modulo 2**16. */ |
| 2316 | unsigned long v1 = XINT (XCAR (o)) & 0xffff; | 2316 | unsigned long v1 = XFIXNUM (XCAR (o)) & 0xffff; |
| 2317 | unsigned long v2 = XINT (XCDR (o)) & 0xffff; | 2317 | unsigned long v2 = XFIXNUM (XCDR (o)) & 0xffff; |
| 2318 | val = (v1 << 16) | v2; | 2318 | val = (v1 << 16) | v2; |
| 2319 | } | 2319 | } |
| 2320 | else | 2320 | else |
| @@ -2560,11 +2560,11 @@ x_send_client_event (Lisp_Object display, Lisp_Object dest, Lisp_Object from, | |||
| 2560 | if (x_check_property_data (values) == -1) | 2560 | if (x_check_property_data (values) == -1) |
| 2561 | error ("Bad data in VALUES, must be number, cons or string"); | 2561 | error ("Bad data in VALUES, must be number, cons or string"); |
| 2562 | 2562 | ||
| 2563 | if (XINT (format) != 8 && XINT (format) != 16 && XINT (format) != 32) | 2563 | if (XFIXNUM (format) != 8 && XFIXNUM (format) != 16 && XFIXNUM (format) != 32) |
| 2564 | error ("FORMAT must be one of 8, 16 or 32"); | 2564 | error ("FORMAT must be one of 8, 16 or 32"); |
| 2565 | 2565 | ||
| 2566 | event.xclient.type = ClientMessage; | 2566 | event.xclient.type = ClientMessage; |
| 2567 | event.xclient.format = XINT (format); | 2567 | event.xclient.format = XFIXNUM (format); |
| 2568 | 2568 | ||
| 2569 | if (FRAMEP (dest) || NILP (dest)) | 2569 | if (FRAMEP (dest) || NILP (dest)) |
| 2570 | { | 2570 | { |