changeset 5641:eb998631a4aa

[project @ 2006-03-04 22:21:01 by jwe]
author jwe
date Sat, 04 Mar 2006 22:21:01 +0000
parents 426719471ac6
children 2618a0750ae6
files src/ChangeLog src/help.cc
diffstat 2 files changed, 12 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Sat Mar 04 06:02:14 2006 +0000
+++ b/src/ChangeLog	Sat Mar 04 22:21:01 2006 +0000
@@ -1,3 +1,9 @@
+2006-03-04  John W. Eaton  <jwe@octave.org>
+
+	* help.cc (additional_help_message): Don't print "\n" before message.
+	(help_from_symbol_table): If Vsuppress_verbose_help_message is
+	true, don't print which info.
+
 2006-03-03  John W. Eaton  <jwe@octave.org>
 
 	* dirfns.cc (Vconfirm_recursive_rmdir): New static variable.
--- a/src/help.cc	Sat Mar 04 06:02:14 2006 +0000
+++ b/src/help.cc	Sat Mar 04 22:21:01 2006 +0000
@@ -450,7 +450,7 @@
 additional_help_message (std::ostream& os)
 {
   if (! Vsuppress_verbose_help_message)
-    os << "\n\
+    os << "\
 Additional help for built-in functions, operators, and variables\n\
 is available in the on-line version of the manual.  Use the command\n\
 `help -i <topic>' to search the manual index.\n\
@@ -845,10 +845,13 @@
 
       if (h.length () > 0)
 	{
-	  sym_rec->which (os);
-	  os << "\n";
 	  h = extract_help_from_dispatch (nm) + h;
 	  display_help_text (os, h);
+	  if (! Vsuppress_verbose_help_message)
+	    {
+	      sym_rec->which (os);
+	      os << "\n";
+	    }
 	  os << "\n";
 	  retval = true;
 	}