Mercurial > octave

changeset 25296:b99b0d423807

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: merge stable to default
author Mike Miller <mtmiller@octave.org>
date Mon, 23 Apr 2018 15:18:42 -0700
parents 01ad54f997f5 (current diff) faed660f7222 (diff)
children 5ca8abb27644
files configure.ac
diffstat 5 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/libgui/module.mk	Sat Apr 21 18:11:46 2018 -0700
+++ b/libgui/module.mk	Mon Apr 23 15:18:42 2018 -0700
@@ -63,7 +63,7 @@
   $(LIBOCTGUI_LINK_DEPS)
 
 # Increment these as needed and according to the rules in the libtool manual:
-%canon_reldir%_liboctgui_current = 2
+%canon_reldir%_liboctgui_current = 3
 %canon_reldir%_liboctgui_revision = 0
 %canon_reldir%_liboctgui_age = 0
 
--- a/libgui/src/m-editor/file-editor.cc	Sat Apr 21 18:11:46 2018 -0700
+++ b/libgui/src/m-editor/file-editor.cc	Mon Apr 23 15:18:42 2018 -0700
@@ -279,9 +279,9 @@
         if (! file.exists ())
           continue;
 
-        session_data item = { QString (), sessionFileNames.at (n), QString ()};
+        session_data item = { 0, sessionFileNames.at (n), QString ()};
         if (do_index)
-          item.index = session_index.at (n);
+          item.index = session_index.at (n).toInt ();
         if (do_encoding)
           item.encoding = session_encodings.at (n);
 
--- a/libgui/src/m-editor/file-editor.h	Sat Apr 21 18:11:46 2018 -0700
+++ b/libgui/src/m-editor/file-editor.h	Mon Apr 23 15:18:42 2018 -0700
@@ -77,7 +77,7 @@
     // struct that allows to sort with respect to the tab index
     struct session_data
     {
-      QString index;
+      int index;
       QString file_name;
       QString encoding;
 
--- a/libinterp/module.mk	Sat Apr 21 18:11:46 2018 -0700
+++ b/libinterp/module.mk	Mon Apr 23 15:18:42 2018 -0700
@@ -167,7 +167,7 @@
   $(LIBOCTINTERP_LINK_DEPS)
 
 # Increment these as needed and according to the rules in the libtool manual:
-%canon_reldir%_liboctinterp_current = 4
+%canon_reldir%_liboctinterp_current = 5
 %canon_reldir%_liboctinterp_revision = 0
 %canon_reldir%_liboctinterp_age = 0
 
--- a/liboctave/module.mk	Sat Apr 21 18:11:46 2018 -0700
+++ b/liboctave/module.mk	Mon Apr 23 15:18:42 2018 -0700
@@ -73,7 +73,7 @@
   $(LIBOCTAVE_LINK_DEPS)
 
 # Increment these as needed and according to the rules in the libtool manual:
-%canon_reldir%_%canon_reldir%_current = 4
+%canon_reldir%_%canon_reldir%_current = 5
 %canon_reldir%_%canon_reldir%_revision = 0
 %canon_reldir%_%canon_reldir%_age = 0