Mercurial > octave

changeset 30440:a9368ec5ac7c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Merge stable to default.
author Markus Mützel <markus.muetzel@gmx.de>
date Sun, 05 Dec 2021 19:35:28 +0100
parents 16929875995b (current diff) fffccc353ffc (diff)
children 33a53086c0fb
files libinterp/octave-value/ov-range.cc
diffstat 3 files changed, 16 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/.github/workflows/make.yaml	Sun Dec 05 14:26:54 2021 +0100
+++ b/.github/workflows/make.yaml	Sun Dec 05 19:35:28 2021 +0100
@@ -60,7 +60,7 @@
         run: |
           echo "::set-output name=TIMESTAMP::$(date +"%Y-%m-%d_%H-%M-%S")"
 
-      - name: setup ccache
+      - name: restore ccache
         # setup the github cache used to maintain the ccache from one job to the next
         # uses: actions/cache@v2
         # The original action doesn't upload on error. Use this fork instead.
@@ -215,7 +215,7 @@
         # Limit the maximum size to avoid exceeding the total cache limits.
         run: |
           test -d /Users/runner/Library/Preferences/ccache || mkdir /Users/runner/Library/Preferences/ccache
-          echo "max_size = 1.5G" >> /Users/runner/Library/Preferences/ccache/ccache.conf
+          echo "max_size = 0.9G" >> /Users/runner/Library/Preferences/ccache/ccache.conf
           ccache -s
           echo "$(brew --prefix)/opt/ccache/libexec" >> $GITHUB_PATH
 
@@ -405,7 +405,7 @@
         run: |
           echo "::set-output name=TIMESTAMP::$(date +"%Y-%m-%d_%H-%M-%S")"
 
-      - name: setup ccache
+      - name: restore ccache
         # Setup the github cache used to maintain the ccache from one job to the next
         uses: actions/cache@v2
         with:
@@ -420,7 +420,7 @@
         run: |
           which ccache
           test -d ~/.ccache || mkdir -p ~/.ccache
-          echo "max_size = 1.2G" > ~/.ccache/ccache.conf
+          echo "max_size = 0.9G" > ~/.ccache/ccache.conf
           echo "compression = true" >> ~/.ccache/ccache.conf
           ccache -s
           # create ccache helper script for Fortran compiler
--- a/libgui/src/m-editor/octave-qscintilla.cc	Sun Dec 05 14:26:54 2021 +0100
+++ b/libgui/src/m-editor/octave-qscintilla.cc	Sun Dec 05 19:35:28 2021 +0100
@@ -277,9 +277,9 @@
           global_pos = editor_rect.topLeft ();   // yes, take top left corner
       }
 
-#if defined (HAVE_QSCI_VERSION_2_6_0)
+#  if defined (HAVE_QSCI_VERSION_2_6_0)
     if (! in_left_margin)
-#endif
+#  endif
       {
         // fill context menu with editor's standard actions
         emit create_context_menu_signal (context_menu);
@@ -305,7 +305,7 @@
               }
           }
       }
-#if defined (HAVE_QSCI_VERSION_2_6_0)
+#  if defined (HAVE_QSCI_VERSION_2_6_0)
     else
       {
         // remove all standard actions from scintilla
@@ -319,10 +319,15 @@
                                      &octave_qscintilla::contextmenu_break_condition);
         act->setData (local_pos);
       }
-#endif
+#  endif
 
     // finally show the menu
     context_menu->exec (global_pos);
+
+#else
+
+    octave_unused_parameter (e);
+
 #endif
   }
 
@@ -1061,6 +1066,8 @@
   {
 #if defined (HAVE_QSCI_VERSION_2_6_0)
     emit context_menu_break_once (lineAt (local_pos));
+#else
+    octave_unused_parameter (local_pos);
 #endif
   }
 
--- a/libinterp/octave-value/ov-range.cc	Sun Dec 05 14:26:54 2021 +0100
+++ b/libinterp/octave-value/ov-range.cc	Sun Dec 05 19:35:28 2021 +0100
@@ -1094,6 +1094,7 @@
 #else
   octave_unused_parameter (loc_id);
   octave_unused_parameter (name);
+  octave_unused_parameter (save_as_floats);
 
   warn_save ("hdf5");