# HG changeset patch
# User Rik <rik@octave.org>
# Date 1386272170 28800
# Node ID 889e2c0832537f412a07379bc7e2eea2bde27cb4
# Parent  2982b42c7469ad90e5fd3359f2d2eadd5748ed73
maint: backout cset ff05d5b70411 on gui-release branch.

diff -r 2982b42c7469 -r 889e2c083253 doc/interpreter/func.txi
--- a/doc/interpreter/func.txi	Thu Dec 05 11:31:13 2013 -0800
+++ b/doc/interpreter/func.txi	Thu Dec 05 11:36:10 2013 -0800
@@ -802,7 +802,7 @@
 
 @DOCSTRING(command_line_path)
 
-@DOCSTRING(dir_in_loadpath)
+@DOCSTRING(find_dir_in_path)
 
 @node Subfunctions
 @subsection Subfunctions
diff -r 2982b42c7469 -r 889e2c083253 libinterp/corefcn/utils.cc
--- a/libinterp/corefcn/utils.cc	Thu Dec 05 11:31:13 2013 -0800
+++ b/libinterp/corefcn/utils.cc	Thu Dec 05 11:36:10 2013 -0800
@@ -303,7 +303,7 @@
 If the second optional argument @qcode{\"all\"} is supplied, return\n\
 a cell array containing the list of all files that have the same\n\
 name in the path.  If no files are found, return an empty cell array.\n\
-@seealso{file_in_path, dir_in_loadpath, path}\n\
+@seealso{file_in_path, find_dir_in_path, path}\n\
 @end deftypefn")
 {
   octave_value retval;
@@ -380,7 +380,7 @@
 If the third optional argument @qcode{\"all\"} is supplied, return\n\
 a cell array containing the list of all files that have the same\n\
 name in the path.  If no files are found, return an empty cell array.\n\
-@seealso{file_in_loadpath, dir_in_loadpath, path}\n\
+@seealso{file_in_loadpath, find_dir_in_path, path}\n\
 @end deftypefn")
 {
   octave_value retval;
@@ -892,10 +892,10 @@
 %!error make_absolute_filename ("foo", "bar")
 */
 
-DEFUN (dir_in_loadpath, args, ,
+DEFUN (find_dir_in_path, args, ,
        "-*- texinfo -*-\n\
-@deftypefn  {Built-in Function} {} dir_in_loadpath (@var{dir})\n\
-@deftypefnx {Built-in Function} {} dir_in_loadpath (@var{dir}, \"all\")\n\
+@deftypefn  {Built-in Function} {} find_dir_in_path (@var{dir})\n\
+@deftypefnx {Built-in Function} {} find_dir_in_path (@var{dir}, \"all\")\n\
 Return the full name of the path element matching @var{dir}.  The\n\
 match is performed at the end of each path element.  For example, if\n\
 @var{dir} is @qcode{\"foo/bar\"}, it matches the path element\n\
@@ -926,7 +926,7 @@
             retval = Cell (load_path::find_matching_dirs (dir));
         }
       else
-        error ("dir_in_loadpath: DIR must be a directory name");
+        error ("find_dir_in_path: DIR must be a directory name");
     }
   else
     print_usage ();
@@ -937,8 +937,8 @@
 /*
 ## FIXME: We need system-dependent tests here.
 
-%!error dir_in_loadpath ()
-%!error dir_in_loadpath ("foo", "bar", 1)
+%!error find_dir_in_path ()
+%!error find_dir_in_path ("foo", "bar", 1)
 */
 
 DEFUNX ("errno", Ferrno, args, ,
diff -r 2982b42c7469 -r 889e2c083253 libinterp/corefcn/variables.cc
--- a/libinterp/corefcn/variables.cc	Thu Dec 05 11:31:13 2013 -0800
+++ b/libinterp/corefcn/variables.cc	Thu Dec 05 11:36:10 2013 -0800
@@ -548,7 +548,7 @@
 Check only for directories.\n\
 @end table\n\
 \n\
-@seealso{file_in_loadpath, file_in_path, dir_in_loadpath, stat}\n\
+@seealso{file_in_loadpath, file_in_path, find_dir_in_path, stat}\n\
 @end deftypefn")
 {
   octave_value retval = false;
diff -r 2982b42c7469 -r 889e2c083253 scripts/deprecated/find_dir_in_path.m
--- a/scripts/deprecated/find_dir_in_path.m	Thu Dec 05 11:31:13 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-## Copyright (C) 2013 John W. Eaton
-##
-## This file is part of Octave.
-##
-## Octave is free software; you can redistribute it and/or modify it
-## under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 3 of the License, or (at
-## your option) any later version.
-##
-## Octave is distributed in the hope that it will be useful, but
-## WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with Octave; see the file COPYING.  If not, see
-## <http://www.gnu.org/licenses/>.
-
-## -*- texinfo -*-
-## @deftypefn  {Built-in Function} {} find_dir_in_path (@var{dir})
-## @deftypefnx {Built-in Function} {} find_dir_in_path (@var{dir}, "all")
-## This function has been deprecated.  Use @code{dir_in_loadpath} instead.
-## @seealso{dir_in_loadpath}
-## @end deftypefn
-
-## Deprecated in version 4.2
-
-function retval = find_dir_in_path (varargin)
-
-  persistent warned = false;
-  if (! warned)
-    warned = true;
-    warning ("Octave:deprecated-function",
-             "find_dir_in_path is obsolete and will be removed from a future version of Octave, please use dir_in_loadpath instead");
-  endif
-
-  retval = dir_in_loadpath (varargin{:});
-
-endfunction
-
diff -r 2982b42c7469 -r 889e2c083253 scripts/help/help.m
--- a/scripts/help/help.m	Thu Dec 05 11:31:13 2013 -0800
+++ b/scripts/help/help.m	Thu Dec 05 11:36:10 2013 -0800
@@ -163,7 +163,7 @@
 
   found = false;
 
-  dlist = dir_in_loadpath (name, "all");
+  dlist = find_dir_in_path (name, "all");
 
   for i = 1:numel (dlist)
     fname = make_absolute_filename (fullfile (dlist{i}, "Contents.m"));
diff -r 2982b42c7469 -r 889e2c083253 scripts/miscellaneous/what.m
--- a/scripts/miscellaneous/what.m	Thu Dec 05 11:31:13 2013 -0800
+++ b/scripts/miscellaneous/what.m	Thu Dec 05 11:36:10 2013 -0800
@@ -37,7 +37,7 @@
       if (d(end) == '/' || d(end) == '\')
         d(end) = [];
       endif
-      dtmp = dir_in_loadpath (d);
+      dtmp = find_dir_in_path (d);
       if (isempty (dtmp))
         error ("what: could not find the directory %s", d);
       endif
diff -r 2982b42c7469 -r 889e2c083253 scripts/testfun/rundemos.m
--- a/scripts/testfun/rundemos.m	Thu Dec 05 11:31:13 2013 -0800
+++ b/scripts/testfun/rundemos.m	Thu Dec 05 11:36:10 2013 -0800
@@ -42,7 +42,7 @@
       if (directory(end) == '/' || directory(end) == '\')
         directory(end) = [];
       endif
-      fullname = dir_in_loadpath (directory);
+      fullname = find_dir_in_path (directory);
       if (isempty (fullname))
         error ("rundemos: DIRECTORY argument must be a valid pathname");
       endif
diff -r 2982b42c7469 -r 889e2c083253 scripts/testfun/runtests.m
--- a/scripts/testfun/runtests.m	Thu Dec 05 11:31:13 2013 -0800
+++ b/scripts/testfun/runtests.m	Thu Dec 05 11:36:10 2013 -0800
@@ -42,7 +42,7 @@
       if (directory(end) == '/' || directory(end) == '\')
         directory(end) = [];
       endif
-      fullname = dir_in_loadpath (directory);
+      fullname = find_dir_in_path (directory);
       if (isempty (fullname))
         error ("runtests: DIRECTORY argument must be a valid pathname");
       endif