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.

diff --git a/src/floatfns.c b/src/floatfns.c
index 8008929be61a76d65fc176074a9a7ab59c7048c9..77e20d5640be16c7dd6cfcf8c994a3d10c2e3803 100644 (file)
--- a/src/floatfns.c
+++ b/src/floatfns.c
@@ -210,7 +210,7 @@ DEFUN ("expt", Fexpt, Sexpt, 2, 2, 0,
 
   /* Common Lisp spec: don't promote if both are integers, and if the
      result is not fractional.  */
-  if (INTEGERP (arg1) && Fnatnump (arg2))
+  if (INTEGERP (arg1) && !NILP (Fnatnump (arg2)))
     return expt_integer (arg1, arg2);
 
   return make_float (pow (XFLOATINT (arg1), XFLOATINT (arg2)));

diff --git a/src/xselect.c b/src/xselect.c
index 4b28d474a0325967a1415e7180352e42b12f303f..53e788523cc12cf9e1e64148e22ab2a794795593 100644 (file)
--- a/src/xselect.c
+++ b/src/xselect.c
@@ -1693,7 +1693,7 @@ static unsigned long
 cons_to_x_long (Lisp_Object obj)
 {
   if (X_ULONG_MAX <= INTMAX_MAX
-      || !Fnatnump (CONSP (obj) ? XCAR (obj) : obj))
+      || NILP (Fnatnump (CONSP (obj) ? XCAR (obj) : obj)))
     return cons_to_signed (obj, X_LONG_MIN, min (X_ULONG_MAX, INTMAX_MAX));
   else
     return cons_to_unsigned (obj, X_ULONG_MAX);