changeset 26696:fa56924691a9

maint: merge stable to default.
author Rik <rik@octave.org>
date Fri, 08 Feb 2019 08:31:53 -0800
parents ce7ed7f27e18 (current diff) 1c3471ce9a46 (diff)
children 8e97a2e5ab66
files
diffstat 3 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/libgui/src/variable-editor-model.cc	Thu Feb 07 18:33:09 2019 +0000
+++ b/libgui/src/variable-editor-model.cc	Fri Feb 08 08:31:53 2019 -0800
@@ -701,6 +701,7 @@
       m_data_cols = val.nfields ();
 
       maybe_resize_rows (m_data_rows + 16);
+      m_display_cols = m_data_cols;
     }
 
     ~vector_struct_model (void) = default;
--- a/scripts/plot/util/print.m	Thu Feb 07 18:33:09 2019 +0000
+++ b/scripts/plot/util/print.m	Fri Feb 08 08:31:53 2019 -0800
@@ -115,7 +115,7 @@
 ## renderer is used.  This is equivalent to changing the figure's
 ## @qcode{"Renderer"} property.  When the figure @code{RendererMode} property
 ## is @qcode{"auto"} Octave will use the @qcode{"opengl"} renderer for raster
-## formats (e.g., JPEG) and @qcode{"painters"} for vector formats (e.g., PDF).
+## formats (e.g., JPEG) and @qcode{"painters"} for vector formats (e.g., PDF)@.
 ## Those options are only supported for the "qt" graphics tookit.
 ##
 ## @item -svgconvert
--- a/scripts/sparse/qmr.m	Thu Feb 07 18:33:09 2019 +0000
+++ b/scripts/sparse/qmr.m	Fri Feb 08 08:31:53 2019 -0800
@@ -262,7 +262,7 @@
       printf ("to a solution with relative residual %e\n", res1);
     endif
   else
-    print usage();
+    print_usage();
   endif
 
 endfunction