# HG changeset patch
# User David Bateman <dbateman@free.fr>
# Date 1288304926 -7200
# Node ID 254a87b40f60334aef18f3b24b8dd3b5bc3f150a
# Parent  31e7e9f94850bd48c9be4014c7c8bfef832f5600
Don't plot patch outlines with the gnuplot backend if the marker property is set to none. Fixes contourf(peaks(),'edgecolor','none')

diff -r 31e7e9f94850 -r 254a87b40f60 scripts/ChangeLog
--- a/scripts/ChangeLog	Fri Oct 29 00:28:01 2010 +0200
+++ b/scripts/ChangeLog	Fri Oct 29 00:28:46 2010 +0200
@@ -1,3 +1,8 @@
+2010-10-27  David Bateman  <dbateman@free.fr>
+
+	* plot/__go_draw_axes__.m: Don't attempt to plot patch outlines if
+	the marker property is set to none.
+
 2010-10-28  Ben Abbott <bpabbott@mac.com>
 
 	* plot/daspect.m, plot/pbaspect.m: Add demos setting both data and
diff -r 31e7e9f94850 -r 254a87b40f60 scripts/plot/__go_draw_axes__.m
--- a/scripts/plot/__go_draw_axes__.m	Fri Oct 29 00:28:01 2010 +0200
+++ b/scripts/plot/__go_draw_axes__.m	Fri Oct 29 00:28:46 2010 +0200
@@ -719,8 +719,9 @@
 
            ## patch outline
            if (!(strncmp (obj.edgecolor, "none", 4)
-                  && strncmp (obj.markeredgecolor, "none", 4)
-                  && strncmp (obj.markerfacecolor, "none", 4)))
+                  && (strncmp (obj.marker, "none", 4) 
+                      || (strncmp (obj.markeredgecolor, "none", 4)
+                          && strncmp (obj.markerfacecolor, "none", 4)))))
 
              data_idx++;
              is_image_data(data_idx) = false;