diff options
author | Charles A. Roelli <charles@aurox.ch> | 2018-08-09 16:00:20 +0200 |
---|---|---|
committer | Charles A. Roelli <charles@aurox.ch> | 2018-08-09 16:00:20 +0200 |
commit | d0b279a50518ce61277cfd274349da8fcc0b0609 (patch) | |
tree | da363120bb7cbfc3fe90d79f93825e1b4ddff96c /src/nsselect.m | |
parent | 90dba077cff06b4f2566acb028286fbffa57f22f (diff) | |
download | emacs-d0b279a50518ce61277cfd274349da8fcc0b0609.tar.gz |
Update src/{ns,mac}*.m to use bignum-compatible macros
* src/nsterm.m:
* src/nsselect.m:
* src/nsmenu.m:
* src/nsimage.m:
* src/nsfont.m:
* src/nsfns.m:
* src/macfont.m: Replace
"make_number" -> "make_fixnum",
"XINT" -> "XFIXNUM",
"XFASTINT" -> "XFIXNAT",
"TYPE_RANGED_INTEGERP" -> "TYPE_RANGED_FIXNUMP",
"RANGED_INTEGERP" -> "RANGED_FIXNUMP",
"CHECK_NATNUM" -> "CHECK_FIXNAT",
"CHECK_NUMBER" -> "CHECK_FIXNUM",
"INTEGERP" -> "FIXNUMP",
"NUMBERP" -> "FIXED_OR_FLOATP",
as done in the following changes:
2018-07-06 Rename integerp->fixnum, etc, in preparation
for bignums (42fe787b)
2018-08-07 More macro renamings for bignum (d1ec3a0a)
Diffstat (limited to 'src/nsselect.m')
-rw-r--r-- | src/nsselect.m | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/nsselect.m b/src/nsselect.m index c72f179ab38..b7e134b5466 100644 --- a/src/nsselect.m +++ b/src/nsselect.m @@ -90,20 +90,20 @@ static Lisp_Object clean_local_selection_data (Lisp_Object obj) { if (CONSP (obj) - && INTEGERP (XCAR (obj)) + && FIXNUMP (XCAR (obj)) && CONSP (XCDR (obj)) - && INTEGERP (XCAR (XCDR (obj))) + && FIXNUMP (XCAR (XCDR (obj))) && NILP (XCDR (XCDR (obj)))) obj = Fcons (XCAR (obj), XCDR (obj)); if (CONSP (obj) - && INTEGERP (XCAR (obj)) - && INTEGERP (XCDR (obj))) + && FIXNUMP (XCAR (obj)) + && FIXNUMP (XCDR (obj))) { - if (XINT (XCAR (obj)) == 0) + if (XFIXNUM (XCAR (obj)) == 0) return XCDR (obj); - if (XINT (XCAR (obj)) == -1) - return make_number (- XINT (XCDR (obj))); + if (XFIXNUM (XCAR (obj)) == -1) + return make_fixnum (- XFIXNUM (XCDR (obj))); } if (VECTORP (obj)) |