Mercurial > octave
changeset 28181:2a47c8633982
maint: merge stable to default
| author | Mike Miller <mtmiller@octave.org> |
|---|---|
| date | Fri, 27 Mar 2020 13:13:09 -0700 |
| parents | 4ca254b41ea8 (current diff) d597dc0a5f74 (diff) |
| children | 56349d9ca566 |
| files | libinterp/octave-value/ov-struct.cc |
| diffstat | 3 files changed, 8 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/interpreter/module.mk Fri Mar 27 08:53:37 2020 +0100 +++ b/doc/interpreter/module.mk Fri Mar 27 13:13:09 2020 -0700 @@ -375,6 +375,8 @@ $(AWK) -f $(srcdir)/%reldir%/mkcontrib.awk $(srcdir)/%reldir%/contributors.in > $@-t && \ mv $@-t $@ +%reldir%/preface.texi: %reldir%/contributors.texi + AUTHORS: %reldir%/preface.texi %reldir%/contributors.texi | %reldir%/$(octave_dirstamp) $(AM_V_MAKEINFO)rm -f $@-t $@ && \ if [ "x$(srcdir)" != "x." ] && [ -f $(srcdir)/%reldir%/contributors.texi ] && [ ! -f %reldir%/contributors.texi ]; then \
--- a/scripts/plot/util/subplot.m Fri Mar 27 08:53:37 2020 +0100 +++ b/scripts/plot/util/subplot.m Fri Mar 27 13:13:09 2020 -0700 @@ -30,7 +30,7 @@ ## @deftypefnx {} {} subplot (@var{hax}) ## @deftypefnx {} {} subplot (@dots{}, "align") ## @deftypefnx {} {} subplot (@dots{}, "replace") -## @deftypefnx {} {} subplot (@dots{}, "position", @var{pos}) +## @deftypefnx {} {} subplot ("position", @var{pos}) ## @deftypefnx {} {} subplot (@dots{}, @var{prop}, @var{val}, @dots{}) ## @deftypefnx {} {@var{hax} =} subplot (@dots{}) ## Set up a plot grid with @var{rows} by @var{cols} subwindows and set the @@ -95,6 +95,9 @@ ## ## Any property/value pairs are passed directly to the underlying axes object. ## +## Any previously existing axes that would be (partly) covered by the newly +## created axes are deleted. +## ## If the output @var{hax} is requested, subplot returns the axes handle for ## the subplot. This is useful for modifying the properties of a subplot ## using @code{set}.
--- a/test/module.mk Fri Mar 27 08:53:37 2020 +0100 +++ b/test/module.mk Fri Mar 27 13:13:09 2020 -0700 @@ -61,14 +61,15 @@ include %reldir%/bug-38236/module.mk include %reldir%/bug-38691/module.mk include %reldir%/bug-41723/module.mk +include %reldir%/bug-44940/module.mk include %reldir%/bug-45351/module.mk -include %reldir%/bug-44940/module.mk include %reldir%/bug-46660/module.mk include %reldir%/bug-47680/module.mk include %reldir%/bug-49379/module.mk include %reldir%/bug-50014/module.mk include %reldir%/bug-50035/module.mk include %reldir%/bug-50716/module.mk +include %reldir%/bug-50831/module.mk include %reldir%/bug-51192/module.mk include %reldir%/bug-51532/module.mk include %reldir%/bug-51534/module.mk