changeset 6427:38df68789f30

[project @ 2007-03-21 18:30:52 by jwe]
author jwe
date Wed, 21 Mar 2007 18:30:52 +0000
parents 182c4b62775d
children 1a59ba7d32f0
files src/ChangeLog src/error.cc
diffstat 2 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Wed Mar 21 17:42:18 2007 +0000
+++ b/src/ChangeLog	Wed Mar 21 18:30:52 2007 +0000
@@ -1,5 +1,8 @@
 2007-03-21  John W. Eaton  <jwe@octave.org>
 
+	* error.cc (Fwarning): Allow setting options with struct.
+	If setting options, return previous state.
+
 	* graphics.cc (axes::axes_properties::set_defaults): Reverse sense
 	of mode test for setting outerposition property.
 	(figure::figure_properties::set): If setting visible property,
--- a/src/error.cc	Wed Mar 21 17:42:18 2007 +0000
+++ b/src/error.cc	Wed Mar 21 18:30:52 2007 +0000
@@ -1152,7 +1152,7 @@
 		}
 
 	      if (done && nargout > 0)
-		retval = warning_options;
+		retval = old_warning_options;
 	    }
 	  else if (arg1 == "query")
 	    {
@@ -1245,7 +1245,7 @@
 	  Octave_map m = arg.map_value ();
 
 	  if (m.contains ("identifier") && m.contains ("state"))
-	    warning ("warning: setting state with structure not implemented");
+	    warning_options = m;
 	  else
 	    error ("warning: expecting structure with fields `identifier' and `state'");