Mercurial > octave-nkf

changeset 4829:71dade3c16b6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2004-03-10 05:12:06 by jwe]
author jwe
date Wed, 10 Mar 2004 05:12:07 +0000
parents e78bc84ac0d3
children a3dd9369a1d4
files src/ChangeLog src/octave.cc src/version.h
diffstat 3 files changed, 14 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Tue Mar 09 22:36:55 2004 +0000
+++ b/src/ChangeLog	Wed Mar 10 05:12:07 2004 +0000
@@ -1,5 +1,11 @@
 2004-03-09  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
+	* version.h (OCTAVE_WWW_STATEMENT): New macro.
+	(OCTAVE_STARTUP_MESSAGE): Include it here.
+	(OCTAVE_NAME_VERSION_COPYRIGHT_COPYING_WARRANTY_AND_BUGS): And here.
+
+	* octave.cc (verbose_usage): Use OCTAVE_WWW_STATEMENT here.
+
 	* DLD-FUNCTIONS/find.cc (find_nonzero_elem_idx): If there are no
 	nonzero elements, return [](0x1) or [](1x0), not [](0x0).
 	Correctly preserve orientation for row vectors.
--- a/src/octave.cc	Tue Mar 09 22:36:55 2004 +0000
+++ b/src/octave.cc	Wed Mar 10 05:12:07 2004 +0000
@@ -319,9 +319,8 @@
   --version, -v           Print version number and exit.\n\
 \n\
   FILE                    Execute commands from FILE.\n\
-\n\
-Additional information about Octave is available via the WWW at\n\
-http://www.octave.org.\n\
+\n"
+OCTAVE_WWW_STATEMENT "\n\
 \n"
 OCTAVE_CONTRIB_STATEMENT "\n\
 \n"
--- a/src/version.h	Tue Mar 09 22:36:55 2004 +0000
+++ b/src/version.h	Wed Mar 10 05:12:07 2004 +0000
@@ -40,6 +40,9 @@
   "There is ABSOLUTELY NO WARRANTY; not even for MERCHANTIBILITY or\n\
 FITNESS FOR A PARTICULAR PURPOSE."
 
+#define OCTAVE_WWW_STATEMENT \
+  "Additional information about Octave is available at http://www.octave.org."
+
 #define OCTAVE_CONTRIB_STATEMENT \
   "Please contribute if you find this software useful.\n\
 For more information, visit http://www.octave.org/help-wanted.html"
@@ -60,6 +63,8 @@
 #define X_OCTAVE_NAME_VERSION_COPYRIGHT_COPYING_WARRANTY_AND_BUGS(ARG) \
   OCTAVE_NAME_VERSION_COPYRIGHT_COPYING_AND_WARRANTY \
   ARG \
+  OCTAVE_WWW_STATEMENT "\n\n" \
+  OCTAVE_CONTRIB_STATEMENT "\n\n" \
   OCTAVE_BUGS_STATEMENT
 
 #define OCTAVE_NAME_VERSION_COPYRIGHT_COPYING_WARRANTY_AND_BUGS \
@@ -67,7 +72,7 @@
 
 #define OCTAVE_STARTUP_MESSAGE \
   X_OCTAVE_NAME_VERSION_COPYRIGHT_COPYING_WARRANTY_AND_BUGS \
-    ("  For details, type `warranty'.\n\n" OCTAVE_CONTRIB_STATEMENT "\n\n")
+    ("  For details, type `warranty'.\n\n")
 
 #endif