Mercurial > jwe > octave

changeset 22690:d7c1263ea850 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Merge away extra head on stable branch.
author John W. Eaton <jwe@octave.org>
date Fri, 28 Oct 2016 09:14:53 -0400
parents b8c5280be6ad (current diff) 9a0265ead11c (diff)
children b4c5fbaa96a8 8acad59ecec0
files
diffstat 2 files changed, 6 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/configure.ac	Fri Oct 28 14:32:12 2016 +0200
+++ b/configure.ac	Fri Oct 28 09:14:53 2016 -0400
@@ -19,21 +19,21 @@
 ### <http://www.gnu.org/licenses/>.
 
 AC_PREREQ([2.63])
-AC_INIT([GNU Octave], [4.2.0-rc2], [http://octave.org/bugs.html], [octave])
+AC_INIT([GNU Octave], [4.2.0-rc3], [http://octave.org/bugs.html], [octave])
 
 dnl Note that the version number is duplicated here and in AC_INIT
 dnl because AC_INIT requires it to be static, not computed from
 dnl shell variables.
 OCTAVE_MAJOR_VERSION=4
 OCTAVE_MINOR_VERSION=2
-OCTAVE_PATCH_VERSION=0-rc2
+OCTAVE_PATCH_VERSION=0-rc3
 
 dnl PACKAGE_VERSION is set by the AC_INIT VERSION arg
 OCTAVE_VERSION="$PACKAGE_VERSION"
 
 OCTAVE_COPYRIGHT="Copyright (C) 2016 John W. Eaton and others."
 
-OCTAVE_RELEASE_DATE="2016-09-20"
+OCTAVE_RELEASE_DATE="2016-10-27"
 
 ## 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/qterminal/libqterminal/win32/QWinTerminalImpl.cpp	Fri Oct 28 14:32:12 2016 +0200
+++ b/libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp	Fri Oct 28 09:14:53 2016 -0400
@@ -383,6 +383,9 @@
   l->addWidget (m_horizontalScrollBar, 1, 0);
   l->addWidget (m_verticalScrollBar, 0, 1);
 
+  SetConsoleCP (65001);
+  SetConsoleOutputCP (65001);
+
   // Choose 15 (0xF) as index into the Windows console color map for the
   // background and 0 (0x0) as the index for the foreground.  This
   // selection corresponds to the indices used in the foregroundColor,