Mercurial > octave

changeset 22604:66ac9dd3e675

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: merge stable to default
author John W. Eaton <jwe@octave.org>
date Thu, 06 Oct 2016 15:42:08 -0400
parents a2ee7fe43834 (current diff) 610f88ed2b78 (diff)
children 54332b6ddeb6
files
diffstat 3 files changed, 11 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/liboctave/wrappers/wait-wrappers.c	Thu Oct 06 12:29:06 2016 -0400
+++ b/liboctave/wrappers/wait-wrappers.c	Thu Oct 06 15:42:08 2016 -0400
@@ -49,7 +49,14 @@
 pid_t
 octave_waitpid_wrapper (pid_t pid, int *statusp, int options)
 {
+#if defined (__WIN32__) && ! defined (__CYGWIN__)
+  // gnulib's waitpid replacement currently uses _cwait, which
+  // apparently only works with console applications.
+  *statusp = 0;
+  return -1;
+#else
   return waitpid (pid, statusp, options);
+#endif
 }
 
 int
--- a/scripts/plot/util/private/__gnuplot_draw_axes__.m	Thu Oct 06 12:29:06 2016 -0400
+++ b/scripts/plot/util/private/__gnuplot_draw_axes__.m	Thu Oct 06 15:42:08 2016 -0400
@@ -1659,7 +1659,7 @@
         if (! is_image_data (i-1))
           fputs (plot_stream, "; ");
           if (bg_is_set)
-            fputs (plot_stream, "unset obj 1; \\\n");
+            fputs (plot_stream, "if (GPVAL_TERM eq \"qt\") unset obj 1;\n");
             bg_is_set = false;
           endif
           if (fg_is_set)
@@ -1682,7 +1682,7 @@
         endif
       elseif (is_image_data (i-1))
         if (bg_is_set)
-          fputs (plot_stream, "unset obj 1; \\\n");
+          fputs (plot_stream, "if (GPVAL_TERM eq \"qt\") unset obj 1;\n");
           bg_is_set = false;
         endif
         if (fg_is_set)
@@ -1730,7 +1730,7 @@
   endif
 
   if (bg_is_set)
-    fputs (plot_stream, "unset obj 1;\n");
+    fputs (plot_stream, "if (GPVAL_TERM eq \"qt\") unset obj 1;\n");
     bg_is_set = false;
   endif
 
--- a/scripts/plot/util/private/__gnuplot_draw_figure__.m	Thu Oct 06 12:29:06 2016 -0400
+++ b/scripts/plot/util/private/__gnuplot_draw_figure__.m	Thu Oct 06 15:42:08 2016 -0400
@@ -38,11 +38,10 @@
       fputs (plot_stream, "set size 1, 1\n");
       bg = get (h, "color");
       if (isnumeric (bg))
-        fprintf (plot_stream, "if (GPVAL_TERM eq \"qt\") {set obj 1 rectangle from screen 0,0 to screen 1,1 behind fc rgb \"#%02x%02x%02x\" fs solid noborder}\n", round (255 * bg));
+        fprintf (plot_stream, "if (GPVAL_TERM eq \"qt\") set obj 1 rectangle from screen 0,0 to screen 1,1 behind fc rgb \"#%02x%02x%02x\" fs solid noborder;\n", round (255 * bg));
         bg_is_set = true;
       else
         bg_is_set = false;
-        fprintf (plot_stream, "unset obj 1");
       endif
       fg_was_set = false;