# HG changeset patch # User Rik # Date 1565151220 25200 # Node ID 29e52bcc72af57f33526294230e33bc738af65c1 # Parent 1582a61402752bb1dfc769f761eba8e6d327dd0e dir.m: Fix occasionally returning incorrect folder field (bug #55448). * dir.m: Replace regexprep with regexp. If match fails, set tmpdir to '.' for current directory. diff -r 1582a6140275 -r 29e52bcc72af scripts/miscellaneous/dir.m --- a/scripts/miscellaneous/dir.m Mon Aug 05 17:15:57 2019 -0700 +++ b/scripts/miscellaneous/dir.m Tue Aug 06 21:13:40 2019 -0700 @@ -134,7 +134,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(i).name = fn; if (! strcmp (last_dir, tmpdir))