Merge from emacs-24; up to 2012-12-11T09:51:12Z!dmantipov@yandex.ru

2 files changed, 8 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 2564e57a825..eb393c93c4a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2013-01-19  Glenn Morris  <rgm@gnu.org>
+
+        * fns.c (Frandom): Doc fix.
+
 2013-01-19  Eli Zaretskii  <eliz@gnu.org>
 
         * editfns.c (get_pos_property): Use SAFE_ALLOCA_LISP, to avoid
diff --git a/src/fns.c b/src/fns.c
index 687c3f6ff39..e066d3cbb8f 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -66,7 +66,10 @@ and `most-positive-fixnum', inclusive, are equally likely.
 
 With positive integer LIMIT, return random number in interval [0,LIMIT).
 With argument t, set the random number seed from the current time and pid.
-Other values of LIMIT are ignored.  */)
+With a string argument, set the seed based on the string's contents.
+Other values of LIMIT are ignored.
+
+See Info node `(elisp)Random Numbers' for more details.  */)
   (Lisp_Object limit)
 {
   EMACS_INT val;