Mercurial > hg > octave-max

changeset 13867:922bfdd80413

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Clean up help about old flags for debug variables * debug.m: Change the wording about old flags into new functions * pt-assign.cc (maybe_warn_former_built_in_variable): Clarify wording about assigning values to functions.
author Jordi Gutiérrez Hermoso <jordigh@octave.org>
date Mon, 14 Nov 2011 21:50:16 -0500
parents 7908b27de857
children 87f78c11d725
files scripts/miscellaneous/debug.m src/pt-assign.cc
diffstat 2 files changed, 12 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/miscellaneous/debug.m
+++ b/scripts/miscellaneous/debug.m
@@ -57,13 +57,16 @@
 ## Quit debugging mode and return to the main prompt.
 ##
 ## @item debug_on_error
-## Flag whether to enter debug mode in case Octave encounters an error.
+## Function to query or set whether to enter debug mode in case Octave
+## encounters an error.
 ##
 ## @item debug_on_warning
-## Flag whether to enter debug mode in case Octave encounters a warning.
+## Function to query or set whether to enter debug mode in case Octave
+## encounters a warning.
 ##
 ## @item debug_on_interrupt
-## Flag whether to enter debug mode in case Octave encounters an interupt.
+## Function to query or set whether to enter debug mode in case Octave
+## encounters an interupt.
 ##
 ## @end table
 ##
--- a/src/pt-assign.cc
+++ b/src/pt-assign.cc
@@ -157,7 +157,12 @@
       const char *nm_c_str = nm.c_str ();
 
       warning_with_id ("Octave:built-in-variable-assignment",
-                       "%s is now a function instead of a built-in variable.  By assigning to %s, you have created a variable that hides the function %s.  To remove the variable and restore the function, type \"clear %s\"",
+                       "\
+In recent versions of Octave, %s is a function instead\n\
+of a built-in variable.\n\n\
+By assigning to %s, you have created a variable that hides\n\
+the function %s. To remove the variable and restore the \n\
+function, type \"clear %s\"\n",
                        nm_c_str, nm_c_str, nm_c_str, nm_c_str);
     }
 }