--- a/scripts/ChangeLog	Thu Apr 03 17:10:15 2008 -0400
+++ b/scripts/ChangeLog	Thu Apr 03 21:39:38 2008 -0400
@@ -1,3 +1,17 @@
+2008-04-03  David Bateman  <dbateman@free.fr>
+
+	* plot/__go_draw_axes__.m: Conditionally "set pm3d implict" for 2D
+	plot or 3D plots with more than one line.
+	
+	* deprecated/splchol.m deprecated/lchol.m deprecated/spfind.m
+	deprecated/spchol.m deprecated/spmin.m deprecated/spmax.m
+	deprecated/spdet.m deprecated/splu.m deprecated/spqr.m
+	deprecated/spatan2.m deprecated/spchol2inv.m
+	deprecated/spcholinv.m deprecated/spcumprod.m deprecated/spdiag.m
+	deprecated/spinv.m deprecated/spcumsum.m deprecated/spprod.m
+	deprecated/spsum.m deprecated/spsumsq.m: New files
+	* deprecated/Makefile.in (SOURCES): Add them here.
+
 2008-04-03  Ben Abbott  <bpabbott@mac.com>
 
 	* sparse/spaugment.m: Increase test script tolerance.
@@ -13,17 +27,6 @@
 	* optimization/lsqnonneg.m: New function.
 	* optimization/Makefile.in (SOURCES): Add it to the list.
 
-2008-04-03  David Bateman  <dbateman@free.fr>
-
-	* deprecated/splchol.m deprecated/lchol.m deprecated/spfind.m
-	deprecated/spchol.m deprecated/spmin.m deprecated/spmax.m
-	deprecated/spdet.m deprecated/splu.m deprecated/spqr.m
-	deprecated/spatan2.m deprecated/spchol2inv.m
-	deprecated/spcholinv.m deprecated/spcumprod.m deprecated/spdiag.m
-	deprecated/spinv.m deprecated/spcumsum.m deprecated/spprod.m
-	deprecated/spsum.m deprecated/spsumsq.m: New files
-	* deprecated/Makefile.in (SOURCES): Add them here.
-
 2008-04-02  David Bateman  <dbateman@free.fr>
 
 	* sparse/spaugment.m: New function

--- a/scripts/plot/__go_draw_axes__.m	Thu Apr 03 17:10:15 2008 -0400
+++ b/scripts/plot/__go_draw_axes__.m	Thu Apr 03 21:39:38 2008 -0400
@@ -64,7 +64,6 @@
       fputs (plot_stream, "set size noratio;\n");
     endif
 
-    fputs (plot_stream, "set pm3d implicit;\n");
     fputs (plot_stream, "unset label;\n");
 
     if (! isempty (axis_obj.title))
@@ -1000,6 +999,14 @@
 
     endfor
 
+    ## This is need to prevent warnings for rotations in 3D plots, while
+    ## allowing colorbars with contours..
+    if (nd == 2 || data_idx > 1)
+      fputs (plot_stream, "set pm3d implicit;\n");
+    else
+      fputs (plot_stream, "set pm3d explicit;\n");
+    endif
+
     if (isnan(hidden_removal) || hidden_removal)
       fputs (plot_stream, "set hidden3d;\n");
     else