# HG changeset patch
# User Markus Mützel <markus.muetzel@gmx.de>
# Date 1640194155 -3600
# Node ID 74fe77faf861953683a78e67a1ae1ab7b3f1e58f
# Parent  b65d423b12a6a391867663ec6b51c27c8a6f99bb# Parent  9c2c0aa0e03ff3e7adff8e2a6fefe764ab98e7b9
maint: merge stable to default.

diff -r b65d423b12a6 -r 74fe77faf861 libgui/graphics/QtHandlesUtils.cc
--- a/libgui/graphics/QtHandlesUtils.cc	Sun Dec 19 20:42:45 2021 +0100
+++ b/libgui/graphics/QtHandlesUtils.cc	Wed Dec 22 18:29:15 2021 +0100
@@ -402,7 +402,11 @@
 
       // We assume a standard mouse with 15 degree steps and Qt returns
       // 1/8 of a degree.
+#if defined (HAVE_QWHEELEVENT_ANGLEDELTA)
       int ydelta = -(event->angleDelta().y ());
+#else
+      int ydelta = -(event->delta ());
+#endif
       retval.setfield ("VerticalScrollCount", octave_value (ydelta / 120));
 
       // FIXME: Is there any way to access the number of lines a scroll step
diff -r b65d423b12a6 -r 74fe77faf861 libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp
--- a/libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp	Sun Dec 19 20:42:45 2021 +0100
+++ b/libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp	Wed Dec 22 18:29:15 2021 +0100
@@ -1332,7 +1332,7 @@
 
   if (! cmd.isEmpty ())
     {
-      STARTUPINFO si;
+      STARTUPINFOW si;
       PROCESS_INFORMATION pi;
 
       ZeroMemory (&si, sizeof (si));
diff -r b65d423b12a6 -r 74fe77faf861 libgui/src/gui-utils.h
--- a/libgui/src/gui-utils.h	Sun Dec 19 20:42:45 2021 +0100
+++ b/libgui/src/gui-utils.h	Wed Dec 22 18:29:15 2021 +0100
@@ -26,6 +26,8 @@
 #if ! defined (octave_gui_utils_h)
 #define octave_gui_utils_h 1
 
+#include "octave-config.h"
+
 #include <QColor>
 
 namespace octave
diff -r b65d423b12a6 -r 74fe77faf861 liboctave/external/mk-f77-def.in.sh
--- a/liboctave/external/mk-f77-def.in.sh	Sun Dec 19 20:42:45 2021 +0100
+++ b/liboctave/external/mk-f77-def.in.sh	Wed Dec 22 18:29:15 2021 +0100
@@ -28,7 +28,7 @@
 : ${SED=@SED@}
 : ${AWK=@AWK@}
 
-F77_TOLOWER="@F77_APPEND_UNDERSCORE@"
+F77_TOLOWER="@F77_TOLOWER@"
 F77_APPEND_UNDERSCORE="@F77_APPEND_UNDERSCORE@"
 F77_APPEND_EXTRA_UNDERSCORE="@F77_APPEND_EXTRA_UNDERSCORE@"
 
diff -r b65d423b12a6 -r 74fe77faf861 liboctave/numeric/lo-amos-proto.h
--- a/liboctave/numeric/lo-amos-proto.h	Sun Dec 19 20:42:45 2021 +0100
+++ b/liboctave/numeric/lo-amos-proto.h	Wed Dec 22 18:29:15 2021 +0100
@@ -75,7 +75,7 @@
   // BESJ
 
   F77_RET_T
-  F77_FUNC (cbesj, cBESJ) (const F77_CMPLX *, const F77_REAL&,
+  F77_FUNC (cbesj, CBESJ) (const F77_CMPLX *, const F77_REAL&,
                            const F77_INT&, const F77_INT&,
                            F77_CMPLX *, F77_INT&, F77_INT&);
 
diff -r b65d423b12a6 -r 74fe77faf861 liboctave/numeric/sparse-qr.cc
--- a/liboctave/numeric/sparse-qr.cc	Sun Dec 19 20:42:45 2021 +0100
+++ b/liboctave/numeric/sparse-qr.cc	Wed Dec 22 18:29:15 2021 +0100
@@ -205,8 +205,12 @@
 
       ColumnVector ret (ncols);
 
-      for (octave_idx_type i = 0; i < ncols; i++)
-        ret(i) = from_suitesparse_long (m_E[i]) + 1;
+      if (m_E)
+        for (octave_idx_type i = 0; i < ncols; i++)
+          ret(i) = from_suitesparse_long (m_E[i]) + 1;
+      else
+        for (octave_idx_type i = 0; i < ncols; i++)
+          ret(i) = i + 1;
 
       return ret;
 
diff -r b65d423b12a6 -r 74fe77faf861 liboctave/util/action-container.h
--- a/liboctave/util/action-container.h	Sun Dec 19 20:42:45 2021 +0100
+++ b/liboctave/util/action-container.h	Wed Dec 22 18:29:15 2021 +0100
@@ -28,6 +28,7 @@
 
 #include "octave-config.h"
 
+#include <cstddef>
 #include <functional>
 
 // This class allows registering actions in a list for later
diff -r b65d423b12a6 -r 74fe77faf861 scripts/testfun/test.m
--- a/scripts/testfun/test.m	Sun Dec 19 20:42:45 2021 +0100
+++ b/scripts/testfun/test.m	Wed Dec 22 18:29:15 2021 +0100
@@ -137,6 +137,12 @@
   persistent __signal_file  = ">>>>> ";
   persistent __signal_skip  = "----- ";
 
+  __nxfail = 0;
+  __nbug = 0;
+  __nskip = 0;
+  __nrtskip = 0;
+  __nregression = 0;
+
   if (nargin < 1)
     print_usage ();
   elseif (! isempty (__name) && ! ischar (__name))