Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs

3 files changed, 6 insertions, 6 deletions

diff --git a/doc/lispref/searching.texi b/doc/lispref/searching.texi
index 38e62040550..740be2a31ff 100644
--- a/doc/lispref/searching.texi
+++ b/doc/lispref/searching.texi
@@ -950,7 +950,7 @@ whitespace:
 @end defun
 
 @cindex optimize regexp
-@defun regexp-opt strings &optional paren noreorder
+@defun regexp-opt strings &optional paren keep-order
 This function returns an efficient regular expression that will match
 any of the strings in the list @var{strings}.  This is useful when you
 need to make matching or searching as fast as possible---for example,
@@ -988,7 +988,7 @@ if it is necessary to ensure that a postfix operator appended to
 it will apply to the whole expression.
 @end table
 
-The optional argument @var{noreorder}, if @code{nil} or omitted,
+The optional argument @var{keep-order}, if @code{nil} or omitted,
 allows the returned regexp to match the strings in any order.  If
 non-@code{nil}, the match is guaranteed to be performed in the order
 given, as if the strings were made into a regexp by joining them with
diff --git a/lisp/emacs-lisp/regexp-opt.el b/lisp/emacs-lisp/regexp-opt.el
index 4404b905a6f..fce6a47d989 100644
--- a/lisp/emacs-lisp/regexp-opt.el
+++ b/lisp/emacs-lisp/regexp-opt.el
@@ -84,7 +84,7 @@
 ;;; Code:
 
 ;;;###autoload
-(defun regexp-opt (strings &optional paren noreorder)
+(defun regexp-opt (strings &optional paren keep-order)
   "Return a regexp to match a string in the list STRINGS.
 Each string should be unique in STRINGS and should not contain
 any regexps, quoted or not.  Optional PAREN specifies how the
@@ -114,7 +114,7 @@ nil
     necessary to ensure that a postfix operator appended to it will
     apply to the whole expression.
 
-The optional argument NOREORDER, if nil or omitted, allows the
+The optional argument KEEP-ORDER, if nil or omitted, allows the
 returned regexp to match the strings in any order.  If non-nil,
 the match is guaranteed to be performed in the order given, as if
 the strings were made into a regexp by joining them with the
@@ -149,7 +149,7 @@ usually more efficient than that of a simplified version:
               (concat (or open "\\(?:") "a\\`\\)"))
              ;; If we cannot reorder, give up all attempts at
              ;; optimisation.  There is room for improvement (Bug#34641).
-             ((and noreorder (regexp-opt--contains-prefix sorted-strings))
+             ((and keep-order (regexp-opt--contains-prefix sorted-strings))
               (concat (or open "\\(?:")
                       (mapconcat #'regexp-quote strings "\\|")
                       "\\)"))
diff --git a/src/frame.c b/src/frame.c
index 3d83dc0a0d8..1219569068e 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -2236,7 +2236,7 @@ delete_frame (Lisp_Object frame, Lisp_Object force)
                      for at least one other frame - so make it visible
                      and quit.  */
                   if (!FRAME_VISIBLE_P (f1) && !FRAME_ICONIFIED_P (f1))
-                    Fmake_frame_visible (frame1);
+                    Fmake_frame_visible (minibuffer_child_frame);
 
                   return Qnil;
                 }