# HG changeset patch
# User jwe
# Date 1174501852 0
# Node ID 38df68789f30754c04bb2199b6db733531260128
# Parent  182c4b62775d7b1c40696da726b79f1df1a9f649
[project @ 2007-03-21 18:30:52 by jwe]

diff -r 182c4b62775d -r 38df68789f30 src/ChangeLog
--- 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,
diff -r 182c4b62775d -r 38df68789f30 src/error.cc
--- 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'");