summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/ChangeLog5
-rw-r--r--src/floatfns.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 925bb8299ba..c8b1e654830 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2012-01-21 Chong Yidong <cyd@gnu.org>
+
+ * floatfns.c (Fcopysign): Make the second argument non-optional,
+ since nil is not allowed anyway.
+
2012-01-21 Andreas Schwab <schwab@linux-m68k.org>
* process.c (read_process_output): Use p instead of XPROCESS (proc).
diff --git a/src/floatfns.c b/src/floatfns.c
index c44784f2120..305c78cae63 100644
--- a/src/floatfns.c
+++ b/src/floatfns.c
@@ -294,7 +294,7 @@ DEFUN ("isnan", Fisnan, Sisnan, 1, 1, 0,
}
#ifdef HAVE_COPYSIGN
-DEFUN ("copysign", Fcopysign, Scopysign, 1, 2, 0,
+DEFUN ("copysign", Fcopysign, Scopysign, 2, 2, 0,
doc: /* Copy sign of X2 to value of X1, and return the result.
Cause an error if X1 or X2 is not a float. */)
(Lisp_Object x1, Lisp_Object x2)