# HG changeset patch
# User Rik <rik@octave.org>
# Date 1523291985 25200
# Node ID e25b8fda2a51b43d30cef2deb8b8261e7a29a235
# Parent  dcd14fd0c5db72e27c7e7632fd07ab0910a30158# Parent  3ae57b161ab4f74bdd71f0d0543d70e95087e10b
maint: merge stable to default.

diff -r dcd14fd0c5db -r e25b8fda2a51 doc/interpreter/basics.txi
--- a/doc/interpreter/basics.txi	Mon Apr 09 11:55:22 2018 -0400
+++ b/doc/interpreter/basics.txi	Mon Apr 09 09:39:45 2018 -0700
@@ -267,9 +267,8 @@
 @example
 @group
 Octave:abbreviated-property-match
-Octave:fopen-file-in-path
+Octave:data-file-in-path
 Octave:function-name-clash
-Octave:load-file-in-path
 Octave:possible-matlab-short-circuit-operator
 @end group
 @end example
diff -r dcd14fd0c5db -r e25b8fda2a51 libgui/src/variable-editor.cc
--- a/libgui/src/variable-editor.cc	Mon Apr 09 11:55:22 2018 -0400
+++ b/libgui/src/variable-editor.cc	Mon Apr 09 09:39:45 2018 -0700
@@ -1079,6 +1079,7 @@
           }
 
         // Put existing variable in focus and raise
+        m_main->parentWidget ()->show ();
         existing_qdw->show ();
         existing_qdw->raise ();
         existing_qdw->activateWindow ();
@@ -1181,6 +1182,7 @@
     if (viewlist.size () == 1)
       m_tool_bar->setEnabled (true);
 
+    m_main->parentWidget ()->show ();
     page->show ();
     page->raise ();
     page->activateWindow ();
diff -r dcd14fd0c5db -r e25b8fda2a51 scripts/help/warning_ids.m
--- a/scripts/help/warning_ids.m	Mon Apr 09 11:55:22 2018 -0400
+++ b/scripts/help/warning_ids.m	Mon Apr 09 09:39:45 2018 -0700
@@ -177,7 +177,12 @@
 ## By default, the @code{Octave:eigs:UnconvergedEigenvalues} warning is
 ## enabled.
 ##
-## @item Octave:fopen-file-in-path
+## @item Octave:data-file-in-path
+## If the @code{Octave:data-file-in-path} warning is enabled, a warning is
+## issued when Octave does not find the target of a file operation such as
+## @code{load} or @code{fopen} directly, but is able to locate the file in
+## Octave's search @code{path} for files.  The warning could indicate that a
+## different file target then the programmer intended is being used.
 ## By default, the @code{Octave:fopen-file-in-path} warning is enabled.
 ##
 ## @item Octave:function-name-clash
@@ -208,9 +213,6 @@
 ## The @option{--traditional} or @option{--braindead} startup options for
 ## Octave may also be of use, @pxref{Command Line Options}.
 ##
-## @item Octave:load-file-in-path
-## By default, the @code{Octave:load-file-in-path} warning is enabled.
-##
 ## @item Octave:logical-conversion
 ## By default, the @code{Octave:logical-conversion} warning is enabled.
 ##