Mercurial > octave

changeset 30424:a5ca02c0ed7d

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 Fri, 03 Dec 2021 18:47:48 +0100
parents b8c7c550e86f (current diff) e658f400a30e (diff)
children d1d96e1339e3
files libinterp/octave-value/ov.cc
diffstat 2 files changed, 6 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/libgui/src/settings-dialog.ui	Thu Dec 02 14:21:16 2021 -0500
+++ b/libgui/src/settings-dialog.ui	Fri Dec 03 18:47:48 2021 +0100
@@ -1179,7 +1179,7 @@
                   <item>
                    <widget class="QCheckBox" name="editor_cb_tabs_rotated">
                     <property name="toolTip">
-                     <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Roate tabs: Vertical when at top or bottom and horizontal when left or right. The close button is not shown in rotated tabs.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                     <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Rotate tabs: Vertical when at top or bottom and horizontal when left or right. The close button is not shown in rotated tabs.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
                     </property>
                     <property name="text">
                      <string>Rotated tabs</string>
@@ -2575,7 +2575,7 @@
                <item row="0" column="0">
                 <widget class="QCheckBox" name="cb_prevent_readline_conflicts">
                  <property name="toolTip">
-                  <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&amp;lt;html&amp;gt;&amp;lt;head/&amp;gt;&amp;lt;body&amp;gt;&amp;lt;p&amp;gt;Disable global shortcuts in order to prevent interference with readline key strokes. Exceptions: Ctrl-C for interrupting the interpreter and the shortcuts for switching to other widgets.&amp;lt;/p&amp;gt;&amp;lt;/body&amp;gt;&amp;lt;/html&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                  <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Disable global shortcuts in order to prevent interference with readline key strokes. Exceptions: Ctrl-C for interrupting the interpreter and the shortcuts for switching to other widgets.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
                  </property>
                  <property name="text">
                   <string>Disable global shortcuts when Command Window has focus</string>
--- a/libinterp/octave-value/ov.cc	Thu Dec 02 14:21:16 2021 -0500
+++ b/libinterp/octave-value/ov.cc	Fri Dec 03 18:47:48 2021 +0100
@@ -3037,14 +3037,15 @@
                     || limit.is_uint32_type () || limit.is_uint64_type ())
                    && increment.scalar_value () < 0;
 
+    octave_value inc = (reverse ? -increment : increment);
+
     check_colon_operand<T> (base, "lower bound");
-    check_colon_operand<T> ((reverse ? -increment : increment), "increment");
+    check_colon_operand<T> (inc, "increment");
     check_colon_operand<T> (limit, "upper bound");
 
     T base_val = octave_value_extract<T> (base);
 
-    T increment_val = octave_value_extract<T> (reverse ? -increment
-                                                       : increment);
+    T increment_val = octave_value_extract<T> (inc);
 
     T limit_val = octave_value_extract<T> (limit);