# HG changeset patch
# User jwe
# Date 1174484327 0
# Node ID 05a48d6cf163882554469a8b436c61a42b07ab10
# Parent  a90b54016b120a10cd51f115531c214eede6ef83
[project @ 2007-03-21 13:38:47 by jwe]

diff -r a90b54016b12 -r 05a48d6cf163 scripts/ChangeLog
--- a/scripts/ChangeLog	Wed Mar 21 13:15:03 2007 +0000
+++ b/scripts/ChangeLog	Wed Mar 21 13:38:47 2007 +0000
@@ -1,3 +1,8 @@
+2007-03-21  John W. Eaton  <jwe@octave.org>
+
+	* plot/subplot.m: If we find an existing subplot region, set
+	it to be the "currentaxes" property for the current figure.
+
 2007-03-20  David Bateman  <dbateman@free.fr>
 
 	* general/Makefile.in: Include arrayfun.m in SOURCES.
diff -r a90b54016b12 -r 05a48d6cf163 scripts/plot/subplot.m
--- a/scripts/plot/subplot.m	Wed Mar 21 13:15:03 2007 +0000
+++ b/scripts/plot/subplot.m	Wed Mar 21 13:38:47 2007 +0000
@@ -140,7 +140,9 @@
     endif
   endfor
 
-  if (! found)
+  if (found)
+    set (cf, "currentaxes", tmp);
+  else
     tmp = axes ("outerposition", pos);
   endif
 
diff -r a90b54016b12 -r 05a48d6cf163 src/ChangeLog
--- a/src/ChangeLog	Wed Mar 21 13:15:03 2007 +0000
+++ b/src/ChangeLog	Wed Mar 21 13:38:47 2007 +0000
@@ -1,5 +1,8 @@
 2007-03-21  John W. Eaton  <jwe@octave.org>
 
+	* graphics.cc (axes::axes_properties::set_defaults): Reverse sense
+	of mode test for setting outerposition property.
+
 	* sysdep.cc (Fpause): Also call drawnow if nargin == 0.
 	(Fkbhit, Fsleep, Fusleep): Also call drawnow here.
 
diff -r a90b54016b12 -r 05a48d6cf163 src/graphics.cc
--- a/src/graphics.cc	Wed Mar 21 13:15:03 2007 +0000
+++ b/src/graphics.cc	Wed Mar 21 13:38:47 2007 +0000
@@ -1835,7 +1835,7 @@
       // FIXME -- this is not quite right; we should preserve
       // "position" and "units".
 
-      if (mode == "replace")
+      if (mode != "replace")
 	{
 	  Matrix touterposition (1, 4, 0.0);
 	  touterposition(2) = 1;