Mercurial > octave-nkf

changeset 18486:ca65b05b9a8a gui-release

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Periodic merge of stable to gui-release.
author John W. Eaton <jwe@octave.org>
date Tue, 18 Feb 2014 02:50:18 -0500
parents 0f3bc7ccb875 (current diff) 55e376fd8636 (diff)
children 8473198fd005 6eae8ba32e62
files configure.ac libgui/src/m-editor/file-editor.cc libinterp/corefcn/file-io.cc
diffstat 5 files changed, 8 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Tue Feb 18 07:33:45 2014 +0100
+++ b/.hgtags	Tue Feb 18 02:50:18 2014 -0500
@@ -83,3 +83,5 @@
 d734216aa2b1022c190e6b07d7ccdd59fe15678f rc-3-8-0-1
 f1fa148766d623f7f24cf541ea8b88d8c1b63d33 rc-3-8-0-2
 b72bcf5f78cc2231e9bf2735d3b8d92779fc4dff release-3-8-0
+85d31344fb23725791bc687337295d47416b9c17 rc-3-8-1-2
+02ce68d63fba31cd14ac060c087212a032ae3202 rc-3-8-1-3
--- a/Makefile.am	Tue Feb 18 07:33:45 2014 +0100
+++ b/Makefile.am	Tue Feb 18 02:50:18 2014 -0500
@@ -159,8 +159,9 @@
 .PHONY: ChangeLog
 
 octetc_DATA = \
+  CITATION \
   NEWS \
-  CITATION
+  config.log
 
 doxyhtml:
 	$(MAKE) -C doc/doxyhtml doxyhtml
--- a/configure.ac	Tue Feb 18 07:33:45 2014 +0100
+++ b/configure.ac	Tue Feb 18 02:50:18 2014 -0500
@@ -25,8 +25,8 @@
 dnl because AC_INIT requires it to be static, not computed from
 dnl shell variables.
 OCTAVE_MAJOR_VERSION=3
-OCTAVE_MINOR_VERSION=8
-OCTAVE_PATCH_VERSION=0
+OCTAVE_MINOR_VERSION=9
+OCTAVE_PATCH_VERSION=0+
 
 dnl PACKAGE_VERSION is set by the AC_INIT VERSION arg
 OCTAVE_VERSION="$PACKAGE_VERSION"
--- a/libgui/src/m-editor/file-editor.cc	Tue Feb 18 07:33:45 2014 +0100
+++ b/libgui/src/m-editor/file-editor.cc	Tue Feb 18 02:50:18 2014 -0500
@@ -370,7 +370,7 @@
                                                     tr ("File\n%1\ndoes not exist. "
                                                         "Do you want to create it?").arg (openFileName),
                                                     QMessageBox::Yes
-                                                    | QMessageBox::No, this);
+                                                    | QMessageBox::No, 0);
 
                           msgBox->setAttribute (Qt::WA_DeleteOnClose);
                           answer = msgBox->exec ();
--- a/libinterp/corefcn/file-io.cc	Tue Feb 18 07:33:45 2014 +0100
+++ b/libinterp/corefcn/file-io.cc	Tue Feb 18 02:50:18 2014 -0500
@@ -1801,7 +1801,7 @@
   return retval;
 }
 
-DEFUN (popen, args, ,
+DEFUNX ("popen", Fpopen, args, ,
        "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {@var{fid} =} popen (@var{command}, @var{mode})\n\
 Start a process and create a pipe.  The name of the command to run is\n\