Mercurial > octave-nkf
diff libinterp/corefcn/utils.cc @ 18074:1e27079409bf
Rename function dir_in_path to dir_in_loadpath.
* NEWS: Announce new function in 4.2.
* scripts/deprecated/find_dir_in_path.m: Call dir_in_loadpath as replacement.
* utils.cc (Fdir_in_loadpath): Renamed dir_in_path to dir_in_loadpath.
* help.m, what.m, rundemos.m, runtests.m: Chane instances of dir_in_path
to dir_in_loadpath.
* utils.cc, variables.cc: Change seealso links to point to dir_in_loadpath.
* func.txi: Document dir_in_loadpath function.
author | Rik <rik@octave.org> |
---|---|
date | Wed, 04 Dec 2013 08:23:42 -0800 |
parents | ff05d5b70411 |
children | 889e2c083253 |
line wrap: on
line diff
--- a/libinterp/corefcn/utils.cc Tue Dec 03 20:39:07 2013 -0800 +++ b/libinterp/corefcn/utils.cc Wed Dec 04 08:23:42 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_path, path}\n\ +@seealso{file_in_path, dir_in_loadpath, 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_path, path}\n\ +@seealso{file_in_loadpath, dir_in_loadpath, path}\n\ @end deftypefn") { octave_value retval; @@ -892,10 +892,10 @@ %!error make_absolute_filename ("foo", "bar") */ -DEFUN (dir_in_path, args, , +DEFUN (dir_in_loadpath, args, , "-*- texinfo -*-\n\ -@deftypefn {Built-in Function} {} dir_in_path (@var{dir})\n\ -@deftypefnx {Built-in Function} {} dir_in_path (@var{dir}, \"all\")\n\ +@deftypefn {Built-in Function} {} dir_in_loadpath (@var{dir})\n\ +@deftypefnx {Built-in Function} {} dir_in_loadpath (@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_path: DIR must be a directory name"); + error ("dir_in_loadpath: DIR must be a directory name"); } else print_usage (); @@ -937,8 +937,8 @@ /* ## FIXME: We need system-dependent tests here. -%!error dir_in_path () -%!error dir_in_path ("foo", "bar", 1) +%!error dir_in_loadpath () +%!error dir_in_loadpath ("foo", "bar", 1) */ DEFUNX ("errno", Ferrno, args, ,