aboutsummaryrefslogtreecommitdiffstats
path: root/src/floatfns.c
diff options
context:
space:
mode:
authorPaul Eggert2012-02-10 10:58:48 -0800
committerPaul Eggert2012-02-10 10:58:48 -0800
commit6e6c82a4e687708d5a7a3887f92db45bd74da276 (patch)
tree85dc3105240e84a8cddadb25d572e170fcdbd8bc /src/floatfns.c
parent78df1fb1d46d556bfc2698ca1802972b13613ba8 (diff)
parentcc26d239af9a82cff079556a1daff4b4bf60eb5c (diff)
downloademacs-6e6c82a4e687708d5a7a3887f92db45bd74da276.tar.gz
emacs-6e6c82a4e687708d5a7a3887f92db45bd74da276.zip
Merge from trunk.
Diffstat (limited to 'src/floatfns.c')
-rw-r--r--src/floatfns.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/floatfns.c b/src/floatfns.c
index 87fa19acb1f..eaa1b32eb17 100644
--- a/src/floatfns.c
+++ b/src/floatfns.c
@@ -294,7 +294,7 @@ DEFUN ("isnan", Fisnan, Sisnan, 1, 1, 0,
294} 294}
295 295
296#ifdef HAVE_COPYSIGN 296#ifdef HAVE_COPYSIGN
297DEFUN ("copysign", Fcopysign, Scopysign, 1, 2, 0, 297DEFUN ("copysign", Fcopysign, Scopysign, 2, 2, 0,
298 doc: /* Copy sign of X2 to value of X1, and return the result. 298 doc: /* Copy sign of X2 to value of X1, and return the result.
299Cause an error if X1 or X2 is not a float. */) 299Cause an error if X1 or X2 is not a float. */)
300 (Lisp_Object x1, Lisp_Object x2) 300 (Lisp_Object x1, Lisp_Object x2)