Mercurial > octave

changeset 25527:d7aafcb1dc1a

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 Fri, 29 Jun 2018 16:48:01 -0400
parents 48a9bd2d0a20 (current diff) c05adc188b98 (diff)
children f67c7f1b4bff
files libgui/src/m-editor/octave-qscintilla.cc
diffstat 2 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/libgui/src/m-editor/octave-qscintilla.cc	Fri Jun 29 16:31:40 2018 -0400
+++ b/libgui/src/m-editor/octave-qscintilla.cc	Fri Jun 29 16:48:01 2018 -0400
@@ -117,6 +117,9 @@
     // clear scintilla edit shortcuts that are handled by the editor
     QsciCommandSet *cmd_set = standardCommands ();
 
+    // Disable buffered drawing on all systems
+    SendScintilla (SCI_SETBUFFEREDDRAW, false);
+
 #if defined (HAVE_QSCI_VERSION_2_6_0)
     // find () was added in QScintilla 2.6
     cmd_set->find (QsciCommand::SelectionCopy)->setKey (0);
--- a/liboctave/external/blas-xtra/xerbla.c	Fri Jun 29 16:31:40 2018 -0400
+++ b/liboctave/external/blas-xtra/xerbla.c	Fri Jun 29 16:48:01 2018 -0400
@@ -59,9 +59,9 @@
                            F77_CHAR_ARG_LEN_DEF (len))
 {
   const char *s = F77_CHAR_ARG_USE (s_arg);
-  size_t slen = F77_CHAR_ARG_LEN_USE (s_arg, len);
+  int slen = F77_CHAR_ARG_LEN_USE (s_arg, len);
 
-  fprintf (stderr, "%.*s: parameter number %ld is invalid\n", slen, s,
+  fprintf (stderr, "%.*s: parameter number %d is invalid\n", slen, s,
            (long) (*info));
 
    if (xerbla_handler)