changeset 3330:69136e3883bf

[project @ 1999-11-02 05:33:27 by jwe]
author jwe
date Tue, 02 Nov 1999 05:33:28 +0000
parents e84e324db1de
children 13cdcb7e5066
files src/ChangeLog src/defun.cc src/help.cc src/help.h
diffstat 4 files changed, 13 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Mon Nov 01 21:58:57 1999 +0000
+++ b/src/ChangeLog	Tue Nov 02 05:33:28 1999 +0000
@@ -1,3 +1,8 @@
+1999-11-01  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* defun.cc (print_usage): Use display_help_text instead of sending
+	help message directly to octave_stdout.
+
 1999-10-29  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* defun-dld.h (INSTALL_DLD_FCNS, INSTALL_DLD_FCN): Delete definitions.
--- a/src/defun.cc	Mon Nov 01 21:58:57 1999 +0000
+++ b/src/defun.cc	Tue Nov 02 05:33:28 1999 +0000
@@ -51,8 +51,11 @@
 
       if (h.length () > 0)
 	{
-	  octave_stdout << "\n*** " << nm << ":\n\n"
-	    << h << "\n";
+	  octave_stdout << "\n*** " << nm << ":\n\n";
+
+	  display_help_text (octave_stdout, h);
+
+	  octave_stdout << "\n";
 
 	  if (! just_usage)
 	    additional_help_message (octave_stdout);
--- a/src/help.cc	Mon Nov 01 21:58:57 1999 +0000
+++ b/src/help.cc	Tue Nov 02 05:33:28 1999 +0000
@@ -679,7 +679,7 @@
   return (p2 != NPOS);
 }
 
-static void
+void
 display_help_text (ostream& os, const string& msg)
 {
   // Look for "-*- texinfo -*-" in first line of help message.  If it
--- a/src/help.h	Mon Nov 01 21:58:57 1999 +0000
+++ b/src/help.h	Tue Nov 02 05:33:28 1999 +0000
@@ -31,6 +31,8 @@
 
 extern string_vector make_name_list (void);
 
+extern void display_help_text (ostream&, const string&);
+
 extern void additional_help_message (ostream&);
 
 // Name of the info file specified on command line.