# HG changeset patch # User jwe # Date 1078895527 0 # Node ID 71dade3c16b6dda4bbb56d53d6be7f9257b44218 # Parent e78bc84ac0d3f5c8648f0dbacaaabf738ee48008 [project @ 2004-03-10 05:12:06 by jwe] diff --git a/src/ChangeLog b/src/ChangeLog --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,11 @@ 2004-03-09 John W. Eaton + * 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. diff --git a/src/octave.cc b/src/octave.cc --- a/src/octave.cc +++ b/src/octave.cc @@ -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" diff --git a/src/version.h b/src/version.h --- a/src/version.h +++ b/src/version.h @@ -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