[Emacs-diffs] Changes to emacs/doc/lispref/minibuf.texi,v

[Eli Zaretskii]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Eli Zaretskii <eliz>    08/10/18 19:31:15

Index: minibuf.texi
===================================================================
RCS file: /cvsroot/emacs/emacs/doc/lispref/minibuf.texi,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- minibuf.texi        18 Oct 2008 16:33:53 -0000      1.10
+++ minibuf.texi        18 Oct 2008 19:31:15 -0000      1.11
@@ -203,24 +203,22 @@
 @end smallexample
 @end defun
 
address@hidden read-regexp prompt &optional default
address@hidden read-regexp prompt &optional default-value
 This function reads a regular expression as a string from the
 minibuffer and returns it.  The argument @var{prompt} is used as in
 @code{read-from-minibuffer}.  The keymap used is
 @code{minibuffer-local-map}, and @code{regexp-history} is used as the
 history list (@pxref{Minibuffer History, regexp-history}).
 
-The optional argument @var{default}, if address@hidden, specifies a
-default value to return if the user enters null input.  As
-in @code{read-from-minibuffer} it should be a string, a list of
-strings, or @code{nil} which is equivalent to an empty string.  When
address@hidden is a string, that string is the default value.  When it
-is a list of strings, the first string is the default value.  To this
-default @code{read-regexp} adds a few other useful candidates, and
-passes them to @code{read-from-minibuffer} to make them available to
-the user as the ``future minibuffer history list'' (@pxref{Minibuffer
-History, future list,, emacs, The GNU Emacs Manual}).  These
-candidates are:
+The optional argument @var{default-value} specifies a default value to
+return if the user enters null input; it should be a string, or
address@hidden which is equivalent to an empty string.
+
+In addition, @code{read-regexp} collects a few useful candidates for
+input and passes them to @code{read-from-minibuffer}, to make them
+available to the user as the ``future minibuffer history list''
+(@pxref{Minibuffer History, future list,, emacs, The GNU Emacs
+Manual}).  These candidates are:
 
 @itemize @minus
 @item