Mercurial > octave

changeset 22743:661cf739818c

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 Wed, 09 Nov 2016 16:58:44 -0500
parents 3b2a30e9e49f (current diff) a8e56d29b34d (diff)
children 2df51376f587
files .hgtags configure.ac libgui/src/m-editor/file-editor-tab.cc
diffstat 4 files changed, 15 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Tue Nov 08 15:55:10 2016 -0800
+++ b/.hgtags	Wed Nov 09 16:58:44 2016 -0500
@@ -105,3 +105,4 @@
 b8eeca55fa8113853a19b1b1ab4d0bb6471dea18 rc-4-2-0-1
 9d50627498141d150755d18ab8e71a3220e40147 rc-4-2-0-2
 96817eafc7997e19a1f89873c05098e08fea1c02 rc-4-2-0-3
+69ac19073ae630b276ff7788b78f72782f281657 rc-4-2-0-4
--- a/configure.ac	Tue Nov 08 15:55:10 2016 -0800
+++ b/configure.ac	Wed Nov 09 16:58:44 2016 -0500
@@ -33,7 +33,7 @@
 
 OCTAVE_COPYRIGHT="Copyright (C) 2016 John W. Eaton and others."
 
-OCTAVE_RELEASE_DATE="2016-10-27"
+OCTAVE_RELEASE_DATE="2016-11-08"
 
 ## The "API version" is used as a way of checking that interfaces in the
 ## liboctave and libinterp libraries haven't changed in a backwardly
--- a/libgui/src/m-editor/file-editor-tab.cc	Tue Nov 08 15:55:10 2016 -0800
+++ b/libgui/src/m-editor/file-editor-tab.cc	Wed Nov 09 16:58:44 2016 -0500
@@ -1840,7 +1840,8 @@
     {
       file_to_save = file_info.canonicalFilePath ();
       // Force reparse of this function next time it is used (bug #46632)
-      if (! exit_debug_and_clear (file_to_save, file_info.baseName ()))
+      if ((Fisdebugmode ())(0).is_true ()
+          && ! exit_debug_and_clear (file_to_save, file_info.baseName ()))
         return;
     }
   else
--- a/test/publish/publish.tst	Tue Nov 08 15:55:10 2016 -0800
+++ b/test/publish/publish.tst	Wed Nov 09 16:58:44 2016 -0500
@@ -2,8 +2,12 @@
 
 %!test
 %! visibility = get (0, "defaultfigurevisible");
+%! toolkit = graphics_toolkit ();
 %! unwind_protect
 %!   set (0, "defaultfigurevisible", "off");
+%!   if (ispc ())
+%!     graphics_toolkit ("gnuplot");
+%!   endif
 %!   cases = dir ("test_script*.m");
 %!   cases = strsplit (strrep ([cases.name], ".m", ".m\n"));
 %!   for i = 1:length(cases)-1
@@ -13,14 +17,19 @@
 %!   rmdir ("html", "s");
 %! unwind_protect_cleanup
 %!   set (0, "defaultfigurevisible", visibility);
+%!   graphics_toolkit (toolkit);
 %! end_unwind_protect
 
 ## grabcode
 
 %!test
 %! visibility = get (0, "defaultfigurevisible");
+%! toolkit = graphics_toolkit ();
 %! unwind_protect
 %!   set (0, "defaultfigurevisible", "off");
+%!   if (ispc ())
+%!     graphics_toolkit ("gnuplot");
+%!   endif
 %!   publish ("test_script.m");
 %!   str1 = fileread ("test_script.m");
 %!   str2 = grabcode ("html/test_script.html");
@@ -32,4 +41,6 @@
 %!   assert (hash ("md5", str1), hash ("md5", str2));
 %! unwind_protect_cleanup
 %!   set (0, "defaultfigurevisible", visibility);
+%!   graphics_toolkit (toolkit);
 %! end_unwind_protect
+