diff options
| author | Paul Eggert | 2018-08-28 09:51:49 -0700 |
|---|---|---|
| committer | Paul Eggert | 2018-08-28 09:52:12 -0700 |
| commit | 5cb057a854a848be85dc2b81f6497964f5a93dbb (patch) | |
| tree | a140c670a5a1b91eb3191eb55ca2fc1cca5039f6 /src/xselect.c | |
| parent | c39ca701d3ffa3a7fcb987170436ad441e8f8ad6 (diff) | |
| download | emacs-5cb057a854a848be85dc2b81f6497964f5a93dbb.tar.gz emacs-5cb057a854a848be85dc2b81f6497964f5a93dbb.zip | |
Fix Fnatnump typos
Problem reported by Glenn Morris in:
https://lists.gnu.org/r/emacs-devel/2018-08/msg00946.html
* src/floatfns.c (Fexpt):
* src/xselect.c (cons_to_x_long):
Don't assume Lisp_Object values are scalars.
Diffstat (limited to 'src/xselect.c')
| -rw-r--r-- | src/xselect.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/xselect.c b/src/xselect.c index 4b28d474a03..53e788523cc 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 | || !Fnatnump (CONSP (obj) ? XCAR (obj) : obj)) | 1696 | || NILP (Fnatnump (CONSP (obj) ? XCAR (obj) : obj))) |
| 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); |