* xterm.c (x_wm_set_icon_pixmap): Call xg_get_pixbuf_from_pix_and_mask

[gnu-emacs] / src / floatfns.c

diff --git a/src/floatfns.c b/src/floatfns.c
index cbcc0bfe5200256215ac6f69209df5476aafca6f..79574e0a69bfffdba70f552099811bfaef4092f8 100644 (file)
--- a/src/floatfns.c
+++ b/src/floatfns.c
@@ -1,5 +1,6 @@
 /* Primitive operations on floating point for GNU Emacs Lisp interpreter.
-   Copyright (C) 1988, 1993, 1994, 1999, 2003, 2005  Free Software Foundation, Inc.
+   Copyright (C) 1988, 1993, 1994, 1999, 2002, 2003, 2004,
+                 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -461,7 +462,7 @@ DEFUN ("expt", Fexpt, Sexpt, 2, 2, 0,
   CHECK_NUMBER_OR_FLOAT (arg2);
   if (INTEGERP (arg1)     /* common lisp spec */
       && INTEGERP (arg2)   /* don't promote, if both are ints, and */
-      && 0 <= XINT (arg2)) /* we are not computing the -ARG2 root */
+      && 0 <= XINT (arg2)) /* we are sure the result is not fractional */
     {                          /* this can be improved by pre-calculating */
       EMACS_INT acc, x, y;     /* some binary powers of x then accumulating */
       Lisp_Object val;