aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRichard M. Stallman2005-08-07 17:47:48 +0000
committerRichard M. Stallman2005-08-07 17:47:48 +0000
commit8b6a95513d11162055cf1cdf7eb9a4a2ade5f1c3 (patch)
tree473c93ec1d9731672c81cb7bd3e848f3f8d17e58 /src
parent44edd521a0d425ea79433bf170233a2b0084820b (diff)
downloademacs-8b6a95513d11162055cf1cdf7eb9a4a2ade5f1c3.tar.gz
emacs-8b6a95513d11162055cf1cdf7eb9a4a2ade5f1c3.zip
(Fexpt): Undo previous change.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog2
-rw-r--r--src/floatfns.c3
2 files changed, 3 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index a44fc3aaa48..e9ade1c6dfd 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
12005-08-07 Richard M. Stallman <rms@gnu.org> 12005-08-07 Richard M. Stallman <rms@gnu.org>
2 2
3 * floatfns.c (Fexpt): Undo previous change.
4
3 * dispnew.c (Fframe_or_buffer_changed_p): Take an arg 5 * dispnew.c (Fframe_or_buffer_changed_p): Take an arg
4 so it can be used with various state vectors. 6 so it can be used with various state vectors.
5 7
diff --git a/src/floatfns.c b/src/floatfns.c
index 79574e0a69b..57bece2708b 100644
--- a/src/floatfns.c
+++ b/src/floatfns.c
@@ -461,8 +461,7 @@ DEFUN ("expt", Fexpt, Sexpt, 2, 2, 0,
461 CHECK_NUMBER_OR_FLOAT (arg1); 461 CHECK_NUMBER_OR_FLOAT (arg1);
462 CHECK_NUMBER_OR_FLOAT (arg2); 462 CHECK_NUMBER_OR_FLOAT (arg2);
463 if (INTEGERP (arg1) /* common lisp spec */ 463 if (INTEGERP (arg1) /* common lisp spec */
464 && INTEGERP (arg2) /* don't promote, if both are ints, and */ 464 && INTEGERP (arg2)) /* don't promote, if both are ints */
465 && 0 <= XINT (arg2)) /* we are sure the result is not fractional */
466 { /* this can be improved by pre-calculating */ 465 { /* this can be improved by pre-calculating */
467 EMACS_INT acc, x, y; /* some binary powers of x then accumulating */ 466 EMACS_INT acc, x, y; /* some binary powers of x then accumulating */
468 Lisp_Object val; 467 Lisp_Object val;