# HG changeset patch
# User Ben Abbott <bpabbott@mac.com>
# Date 1245079313 14400
# Node ID 335dc62068a80dc72d1056c871206a02025af756
# Parent  b59cc3252a51860da4e169b6f85ee92b59dae0bb
plotyy.m: Consider dataaspectratiomode before changing dataaspectratio.

diff --git a/scripts/ChangeLog b/scripts/ChangeLog
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,3 +1,8 @@
+2009-06-15  Ben Abbott <bpabbott@mac.com>
+
+	* plot/plotyy.m: Consider dataaspectratiomode before changing
+	dataaspectratio.
+
 2009-06-14  Ben Abbott <bpabbott@mac.com>
 
 	* plot/plotyy.m: Fix compatibility with subplot, add listeners for
diff --git a/scripts/plot/plotyy.m b/scripts/plot/plotyy.m
--- a/scripts/plot/plotyy.m
+++ b/scripts/plot/plotyy.m
@@ -237,15 +237,18 @@
       position = get (h, "position");
       view = get (h, "view");
       dataaspectratio = get (h, "dataaspectratio");
+      dataaspectratiomode = get (h, "dataaspectratiomode");
       oldposition = get (ax2, "position");
       oldview = get (ax2, "view");
       olddataaspectratio = get (ax2, "dataaspectratio");
-      if (! (isequal (position, oldposition)
-             && isequal (view, oldview)
-             && isequal (dataaspectratio, olddataaspectratio)))
-	set (ax2, "position", position,
-                  "view", view,
-		  "dataaspectratio", dataaspectratio);
+      olddataaspectratiomode = get (ax2, "dataaspectratiomode");
+      if (! (isequal (position, oldposition) && isequal (view, oldview)))
+	set (ax2, "position", position, "view", view)
+      endif
+      if (! (isequal (dataaspectratio, olddataaspectratio) 
+	     && isequal (dataaspectratiomode, olddataaspectratiomode)))
+	set (ax2, "dataaspectratio", dataaspectratio);
+	set (ax2, "dataaspectratiomode", dataaspectratiomode);
       endif
     unwind_protect_cleanup
       recursion = false;