changeset 5190:2021bbfff5fd

[project @ 2005-03-04 02:51:33 by jwe]
author jwe
date Fri, 04 Mar 2005 02:51:33 +0000
parents 85b315ad5f7d
children de5c13830b6f
files doc/interpreter/basics.txi src/octave.cc
diffstat 2 files changed, 13 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/doc/interpreter/basics.txi
+++ b/doc/interpreter/basics.txi
@@ -66,6 +66,10 @@
 @cindex @code{-x}
 Echo commands as they are executed.
 
+@item --eval @var{code}
+Evaluate @var{code} and exit when done unless @code{--persist} is also
+specified.
+
 @item --exec-path @var{path}
 @cindex @code{--exec-path @var{path}}
 Specify the path to search for programs to run.  The value of @var{path}
@@ -139,6 +143,10 @@
 @code{OCTAVE_PATH} found in the environment, but not any commands in the
 system or user startup files that set the built-in variable @code{LOADPATH}.
 
+@item --persist
+Go to interactive mode after @code{--eval} or reading from a file
+named on the command line.
+
 @item --silent
 @itemx --quiet
 @itemx -q
@@ -181,7 +189,8 @@
 Print the program version number and exit.
 
 @item @var{file}
-Execute commands from @var{file}.
+Execute commands from @var{file}.  Exit when done unless
+@code{--persist} is also specified.
 @end table
 
 Octave also includes several built-in variables that contain information
--- a/src/octave.cc
+++ b/src/octave.cc
@@ -367,8 +367,8 @@
 \n\
   --debug, -d             Enter parser debugging mode.\n\
   --echo-commands, -x     Echo commands as they are executed.\n\
+  --eval CODE             Evaluate CODE and exit when done unless --persist.\n\
   --exec-path PATH        Set path for executing subprograms.\n\
-  --eval CODE             Evaluate CODE and exit when done unless --persist.\n\
   --help, -h, -?          Print short help message and exit.\n\
   --info-file FILE        Use top-level info file FILE.\n\
   --info-program PROGRAM  Use PROGRAM for reading info files.\n\
@@ -385,7 +385,8 @@
   --verbose, -V           Enable verbose output in some cases.\n\
   --version, -v           Print version number and exit.\n\
 \n\
-  FILE                    Execute commands from FILE.\n\
+  FILE                    Execute commands from FILE.  Exit when done\n\
+                          unless --persist is also specified\n\.
 \n"
 OCTAVE_WWW_STATEMENT "\n\
 \n"