changeset 27329:d5e24466835f

maint: merge stable to default.
author Rik <rik@octave.org>
date Tue, 06 Aug 2019 21:14:38 -0700
parents 728e4d99febb (current diff) 29e52bcc72af (diff)
children e449134870fb
files scripts/miscellaneous/dir.m
diffstat 1 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/miscellaneous/dir.m	Mon Aug 05 14:42:37 2019 -0500
+++ b/scripts/miscellaneous/dir.m	Tue Aug 06 21:14:38 2019 -0700
@@ -136,7 +136,12 @@
             st = xst;
           endif
         endif
-        tmpdir = regexprep (fn, re, '$1');
+        [sts, tmpdir] = regexp (fn, re, "start", "tokens");
+        if (isempty (sts))
+          tmpdir = ".";
+        else
+          tmpdir = tmpdir{1}{1};
+        endif
         fn = regexprep (fn, re, '$2$3');
         info(++cnt).name = fn;
         if (! strcmp (last_dir, tmpdir))