Mercurial > octave

diff libinterp/corefcn/variables.cc @ 20713:2469d78a1d8b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Consistently use 'filename' rather than 'file name' throughout code base. * bootstrap, configure.ac, basics.txi, gui.txi, io.txi, mkoctfile.1, __init_qt__.cc, dialog.cc, files-dock-widget.cc, find-files-dialog.cc, file-editor-tab.cc, file-editor-tab.h, file-editor.cc, shortcut-manager.cc, debug.cc, dirfns.cc, dlmread.cc, file-io.cc, input.cc, load-path.h, load-save.cc, symtab.h, sysdep.cc, utils.cc, variables.cc, zfstream.h, oct-parse.in.yy, dir-ops.cc, file-ops.h, cmd-hist.cc, cmd-hist.h, octave_tmp_file_name.m, uigetfile.m, uiputfile.m, imshow.m, imageIO.m, dlmwrite.m, importdata.m, copyfile.m, edit.m, mkoctfile.m, movefile.m, open.m, perl.m, python.m, run.m, tmpnam.m, unpack.m, fminsearch.m, configure_make.m, print.m, __print_parse_opts__.m, test.m, main.in.cc, mkoctfile.in.cc, module.mk: Consistently use 'filename' rather than 'file name' throughout code base.
author Rik <rik@octave.org>
date Wed, 18 Nov 2015 15:48:27 -0800
parents 7b608fadc663
children a5949b3d2332
line wrap: on
line diff
--- a/libinterp/corefcn/variables.cc	Wed Nov 18 15:44:33 2015 -0500
+++ b/libinterp/corefcn/variables.cc	Wed Nov 18 15:48:27 2015 -0800
@@ -530,7 +530,7 @@
 @var{name} is a variable.\n\
 \n\
 @item 2\n\
-@var{name} is an absolute file name, an ordinary file in Octave's\n\
+@var{name} is an absolute filename, an ordinary file in Octave's\n\
 @code{path}, or (after appending @samp{.m}) a function file in Octave's\n\
 @code{path}.\n\
 \n\
@@ -637,13 +637,13 @@
 %!assert (exist ("print_usage", "file"), 2)
 %!assert (exist ("print_usage", "dir"), 0)
 
-## Don't search path for rooted relative file names
+## Don't search path for rooted relative filenames
 %!assert (exist ("plot.m", "file"), 2);
 %!assert (exist ("./plot.m", "file"), 0);
 %!assert (exist ("./%nonexistentfile%", "file"), 0);
 %!assert (exist ("%nonexistentfile%", "file"), 0);
 
-## Don't search path for absolute file names
+## Don't search path for absolute filenames
 %!test
 %! tname = tempname (pwd ());
 %! unwind_protect
@@ -1629,7 +1629,7 @@
           // implement this option there so that the variables are never
           // stored at all.
           if (i == argc - 1)
-            error ("whos: -file argument must be followed by a file name");
+            error ("whos: -file argument must be followed by a filename");
           else
             {
               std::string nm = argv[i + 1];