changeset 20513:a9a1f021d96b

maint: Periodic merge of stable to default.
author John W. Eaton <jwe@octave.org>
date Thu, 03 Sep 2015 19:00:53 -0400
parents c36f06ef7539 (current diff) 7ddb10b31126 (diff)
children ac0f7acdc3fd
files doc/interpreter/genpropdoc.m
diffstat 3 files changed, 27 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/doc/interpreter/genpropdoc.m	Wed Sep 02 18:18:19 2015 -0400
+++ b/doc/interpreter/genpropdoc.m	Thu Sep 03 19:00:53 2015 -0400
@@ -720,6 +720,7 @@
       case "xtick"
         s.doc = "Position of x tick marks.  __modemsg__.";
         s.valid = "vector";
+        s.printdefault = false;
 
       case "xticklabel"
         s.doc = "Labels of x tick marks.  __modemsg__.";
@@ -760,6 +761,7 @@
       case "ytick"
         s.doc = "Position of y tick marks.  __modemsg__.";
         s.valid = "vector";
+        s.printdefault = false;
 
       case "yticklabel"
         s.doc = "Labels of y tick marks.  __modemsg__.";
@@ -799,6 +801,7 @@
       case "ztick"
         s.doc = "Position of z tick marks.  __modemsg__.";
         s.valid = "vector";
+        s.printdefault = false;
 
       case "zticklabel"
         s.doc = "Labels of z tick marks.  __modemsg__.";
--- a/scripts/startup/__finish__.m	Wed Sep 02 18:18:19 2015 -0400
+++ b/scripts/startup/__finish__.m	Thu Sep 03 19:00:53 2015 -0400
@@ -17,27 +17,25 @@
 ## <http://www.gnu.org/licenses/>.
 
 ## -*- texinfo -*-
-## @deftypefn {Function File} {} __finish__ ()
-## Undocumented internal function.
+## @deftypefn {Script File} {} __finish__
+## Check for the existence of the function/script, @file{finish}, in the
+## path or current working directory and execute it.
+##
+## This function is intended to be excecuted upon a clean exit from Octave.
+## This is accomplished in the system script @file{startup/octaverc} by use of
+## the built-in function @code{atexit}.
+## @seealso{atexit}
 ## @end deftypefn
 
-## Check for the existence of the function/script, @file{finish}, in the
-## path or current working directory and execute it.  This function is
-## intended to be excecuted upon a clean exit from Octave.  This is
-## accomplished in the system script @file{startup/octaverc} by use of
-## the built-in function @code{atexit}.
+## No function declaration, this is is an Octave script.  This means we are
+## still in the base workspace with access to all user variables.
 
-function __finish__ ()
-
-  if (exist ("finish", "file"))
-    ## No arg list here since finish might be a script.
-    finish;
-  endif
-
-endfunction
+if (exist ("finish", "file"))
+  ## No arg list here since finish might be a script.
+  finish;
+endif
 
 
-
-## No test needed for internal helper function.
+## No test needed for internal helper m-file.
 %!assert (1)
 
--- a/test/range.tst	Wed Sep 02 18:18:19 2015 -0400
+++ b/test/range.tst	Thu Sep 03 19:00:53 2015 -0400
@@ -107,3 +107,12 @@
 %!assert (signbit (sort (r, "descend")), logical ([0 0 0 1]))
 %!assert (signbit (sort (rrev, "ascend")), logical ([1 0 0 0]))
 
+## Test sorting of ranges (bug #45739)
+
+%!shared r, rrev
+%! r = 1:2:10;
+%! rrev = 10:-2:1;
+
+%!assert (sort (r, "descend"), [9 7 5 3 1])
+%!assert (sort (rrev, "ascend"), [2 4 6 8 10])
+