Mercurial > jwe > octave
changeset 26855:98f34c841f89
maint: merge stable to default.
| author | Rik <rik@octave.org> |
|---|---|
| date | Tue, 05 Mar 2019 17:31:03 -0800 |
| parents | 603f5d6ada56 (current diff) 4d7665fc8f6c (diff) |
| children | ab97008be411 |
| files | etc/module.mk |
| diffstat | 3 files changed, 17 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/interpreter/package.txi Tue Mar 05 22:54:52 2019 +0000 +++ b/doc/interpreter/package.txi Tue Mar 05 17:31:03 2019 -0800 @@ -358,8 +358,12 @@ Name of the package. @item Version -Version of the package. A package version must be 3 numbers separated -by dots. +Version of the package. A package version is typically digits separated by +dots but may also contain @samp{+}, @samp{-}, @samp{~}, and alphanumeric +characters (in the "C" locale). For example, @qcode{"2.1.0+"} could indicate +a development version of a package. +@c regexp in get_description.m:is_valid_pkg_version_string +Versions are compared using @ref{XREFcompare_versions,,compare_versions}. @item Date Date of last update.
--- a/etc/module.mk Tue Mar 05 22:54:52 2019 +0000 +++ b/etc/module.mk Tue Mar 05 17:31:03 2019 -0800 @@ -54,6 +54,7 @@ %reldir%/icons/octave-sombrero.png icon_PNG_SIZES = \ + 1024 \ 512 \ 256 \ 128 \
--- a/scripts/plot/draw/line.m Tue Mar 05 22:54:52 2019 +0000 +++ b/scripts/plot/draw/line.m Tue Mar 05 17:31:03 2019 -0800 @@ -68,11 +68,20 @@ if (isempty (hax)) hax = gca (); + oldfig = []; else hax = hax(1); + oldfig = get (0, "currentfigure"); + set (0, "currentfigure", ancestor (hax, "figure")); endif - htmp = __line__ (hax, varargin{:}); + unwind_protect + htmp = __line__ (hax, varargin{:}); + unwind_protect_cleanup + if (! isempty (oldfig)) + set (0, "currentfigure", oldfig); + endif + end_unwind_protect if (nargout > 0) h = htmp;