(Frandom, Fstring_make_multibyte): Doc fixes.

2 files changed, 14 insertions, 6 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index c9da7bc57a1..e3147738f33 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,7 +1,9 @@
 2003-12-23  Luc Teirlinck  <teirllm@auburn.edu>
 
-        * minibuf.c (read_minibuf): Allow INITIAL to be a cons of a
-        string and an integer.  Adapt the docstring accordingly.
+        * fns.c (Frandom, Fstring_make_multibyte): Doc fixes.
+
+        * minibuf.c (read_minibuf): Allow INITIAL to be a cons of a string
+        and an integer.  Adapt the introductory comment accordingly.
         (Fread_from_minibuffer): Delete code moved into read_minibuf.
         Doc fix.
         (Fread_minibuffer, Fread_no_blanks_input): Adapt to changes in
diff --git a/src/fns.c b/src/fns.c
index fed948dc29f..3ca6230021b 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -95,7 +95,7 @@ DEFUN ("identity", Fidentity, Sidentity, 1, 1, 0,
 DEFUN ("random", Frandom, Srandom, 0, 1, 0,
        doc: /* Return a pseudo-random number.
 All integers representable in Lisp are equally likely.
-  On most systems, this is 28 bits' worth.
+  On most systems, this is 29 bits' worth.
 With positive integer argument N, return random number in interval [0,N).
 With argument t, set the random number seed from the current time and pid. */)
      (n)
@@ -1099,8 +1099,14 @@ string_make_unibyte (string)
 DEFUN ("string-make-multibyte", Fstring_make_multibyte, Sstring_make_multibyte,
        1, 1, 0,
        doc: /* Return the multibyte equivalent of STRING.
-The function `unibyte-char-to-multibyte' is used to convert
-each unibyte character to a multibyte character. */)
+If STRING is unibyte and contains non-ASCII characters, the function
+`unibyte-char-to-multibyte' is used to convert each unibyte character
+to a multibyte character.  In this case, the returned string is a
+newly created string with no text properties.  If STRING is multibyte
+or entirely ASCII, it is returned unchanged.  In particular, when
+STRING is unibyte and entirely ASCII, the returned string is unibyte.
+\(When the characters are all ASCII, Emacs primitives will treat the
+string the same way whether it is unibyte or multibyte.)  */)
      (string)
      Lisp_Object string;
 {
@@ -5648,7 +5654,7 @@ This applies to commands from menus and tool bar buttons.  The value of
 `use-dialog-box' takes precedence over this variable, so a file dialog is only
 used if both `use-dialog-box' and this variable are non-nil.  */);
   use_file_dialog = 1;
-  
+
   defsubr (&Sidentity);
   defsubr (&Srandom);
   defsubr (&Slength);