--- a/scripts/plot/contour.m
+++ b/scripts/plot/contour.m
@@ -44,23 +44,23 @@
       n = y; 
     endif
     if (ismatrix (z))
-      __gnuplot_set__ nosurface;
-      __gnuplot_set__ contour;
-      __gnuplot_set__ cntrparam bspline;
+      __gnuplot_raw__ ("set nosurface;\n");
+      __gnuplot_raw__ ("set contour;\n");
+      __gnuplot_raw__ ("set cntrparam bspline;\n");
       if (isscalar (n))
-        command = sprintf ("__gnuplot_set__ cntrparam levels %d", n);
+        command = sprintf ("set cntrparam levels %d;\n", n);
       elseif (isvector (n))
         tmp = sprintf ("%f", n(1));
         for i = 2:length (n)
           tmp = sprintf ("%s, %f", tmp, n(i));
         endfor
-        command = sprintf ("__gnuplot_set__ cntrparam levels discrete %s", tmp);
+        command = sprintf ("set cntrparam levels discrete %s;\n", tmp);
       else
 	error ("contour: levels must be a scalar or vector") ;
       endif
-      eval (command);
-      __gnuplot_set__ noparametric;
-      __gnuplot_set__ view 0, 0, 1, 1;
+      __gnuplot_raw__ (command);
+      __gnuplot_set__ parametric;
+      __gnuplot_raw__ ("set view 0, 0, 1, 1;\n");
       __gnuplot_splot__ z w l 1;
     else
       error ("contour: z of contour (z, levels) must be a matrix");
@@ -104,23 +104,23 @@
 	  error (size_msg);
 	endif
       endif
-      __gnuplot_set__ nosurface;
-      __gnuplot_set__ contour;
-      __gnuplot_set__ cntrparam bspline;
+      __gnuplot_raw__ ("set nosurface;\n");
+      __gnuplot_raw__ ("set contour;\n");
+      __gnuplot_raw__ ("set cntrparam bspline;\n");
       if (isscalar (n))
-        command = sprintf ("__gnuplot_set__ cntrparam levels %d", n);
+        command = sprintf ("set cntrparam levels %d;\n", n);
       elseif (isvector (n))
         tmp = sprintf ("%f", n(1));
         for i = 2:length (n)
           tmp = sprintf ("%s, %f", tmp, n(i));
         endfor
-        command = sprintf ("__gnuplot_set__ cntrparam levels discrete %s", tmp);
+        command = sprintf ("set cntrparam levels discrete %s;\n", tmp);
       else
 	error ("contour: levels must be a scalar or vector") ;
       endif
-      eval (command);
+      __gnuplot_raw__ (command);
       __gnuplot_set__ parametric;
-      __gnuplot_set__ view 0, 0, 1, 1;
+      __gnuplot_raw__ ("set view 0, 0, 1, 1;\n");
       __gnuplot_splot__ zz w l 1;
     else
       error ("contour: x and y must be vectors and z must be a matrix");