--- a/libgui/src/gui-preferences-sc.h	Sat Dec 04 11:00:16 2021 -0500
+++ b/libgui/src/gui-preferences-sc.h	Sun Dec 05 12:01:40 2021 +0100
@@ -264,7 +264,7 @@
 sc_main_ctrld ("shortcuts/main_ctrld", QVariant (false));
 
 const gui_pref
-sc_prevent_rl_conflicts ("shortcuts/prevent_readline_conflicts", QVariant (true));
+sc_prevent_rl_conflicts ("shortcuts/prevent_readline_conflicts", QVariant (false));
 const gui_pref
 sc_prevent_rl_conflicts_menu ("shortcuts/prevent_readline_conflicts_menu", QVariant (false));
 

--- a/libgui/src/set-path-dialog.cc	Sat Dec 04 11:00:16 2021 -0500
+++ b/libgui/src/set-path-dialog.cc	Sun Dec 05 12:01:40 2021 +0100
@@ -74,7 +74,7 @@
     m_add_folder_button->setMenu (add_dir_menu);
     add_dir_menu->addAction (tr ("Single Folder"),
                              this, &set_path_dialog::add_dir);
-    add_dir_menu->addAction (tr ("Folder with Subfolders"),
+    add_dir_menu->addAction (tr ("Folder With Subfolders"),
                              this, &set_path_dialog::add_dir_subdirs);
 
     m_move_to_top_button = new QPushButton (tr ("Move to Top"));

--- a/libgui/src/shortcut-manager.cc	Sat Dec 04 11:00:16 2021 -0500
+++ b/libgui/src/shortcut-manager.cc	Sun Dec 05 12:01:40 2021 +0100
@@ -188,7 +188,7 @@
     init (tr ("Reset Default Window Layout"), sc_main_window_reset);
 
     // help
-    init (tr ("Show Ondisk Documentation"), sc_main_help_ondisk_doc);
+    init (tr ("Show On-disk Documentation"), sc_main_help_ondisk_doc);
     init (tr ("Show Online Documentation"), sc_main_help_online_doc);
     init (tr ("Report Bug"), sc_main_help_report_bug);
     init (tr ("Octave Packages"), sc_main_help_packages);

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/liboctave/array/Sparse-fwd.h	Sun Dec 05 12:01:40 2021 +0100
@@ -0,0 +1,33 @@
+////////////////////////////////////////////////////////////////////////
+//
+// Copyright (C) 2021 The Octave Project Developers
+//
+// See the file COPYRIGHT.md in the top-level directory of this
+// distribution or <https://octave.org/copyright/>.
+//
+// This file is part of Octave.
+//
+// Octave is free software: you can redistribute it and/or modify it
+// under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Octave is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Octave; see the file COPYING.  If not, see
+// <https://www.gnu.org/licenses/>.
+//
+////////////////////////////////////////////////////////////////////////
+
+#if ! defined (octave_Sparse_fwd_h)
+#define octave_Sparse_fwd_h 1
+
+#include "octave-config.h"
+
+template <typename T> class OCTAVE_API Sparse;
+
+#endif

--- a/liboctave/array/Sparse.h	Sat Dec 04 11:00:16 2021 -0500
+++ b/liboctave/array/Sparse.h	Sun Dec 05 12:01:40 2021 +0100
@@ -36,17 +36,16 @@
 #include <string>
 
 #include "Array-fwd.h"
+#include "Sparse-fwd.h"
 
 class PermMatrix;
 
 // Two dimensional sparse class.  Handles the reference counting for
 // all the derived classes.
 
-// forward declare template with visibility attribute
-template <typename T> class OCTAVE_API Sparse;
-
 template <typename T>
 class
+OCTAVE_API
 Sparse
 {
 public:

--- a/liboctave/array/idx-vector.h	Sat Dec 04 11:00:16 2021 -0500
+++ b/liboctave/array/idx-vector.h	Sun Dec 05 12:01:40 2021 +0100
@@ -39,8 +39,7 @@
 #include "dim-vector.h"
 #include "oct-inttypes-fwd.h"
 #include "oct-refcount.h"
-
-template <typename T> class Sparse;
+#include "Sparse-fwd.h"
 
 namespace octave
 {

--- a/liboctave/array/module.mk	Sat Dec 04 11:00:16 2021 -0500
+++ b/liboctave/array/module.mk	Sun Dec 05 12:01:40 2021 +0100
@@ -44,6 +44,7 @@
   %reldir%/MSparse.h \
   %reldir%/PermMatrix.h \
   %reldir%/Range.h \
+  %reldir%/Sparse-fwd.h \
   %reldir%/Sparse.h \
   %reldir%/uint16NDArray.h \
   %reldir%/uint32NDArray.h \