commit b189295b72030f00c45c30d3daecf85d457221f8
author Bram Moolenaar <Bram@vim.org> Tue Oct 08 23:26:50 2019 +0200
committer Bram Moolenaar <Bram@vim.org> Tue Oct 08 23:26:50 2019 +0200
tree 4d606bc64db62563d36e635dcdb33af616609220
parent 345f28df5482cd35f5fa74b06443376379f113b0

patch 8.1.2125: fnamemodify() fails when repeating :e

Problem:    Fnamemodify() fails when repeating :e.
Solution:   Do not go before the tail. (Rob Pilling, closes #5024)

src/filepath.c

diff --git a/src/filepath.c b/src/filepath.c
index 3a06eec..cf401dc 100644
--- a/src/filepath.c
+++ b/src/filepath.c
@@ -563,7 +563,11 @@
 	}
 	else				// :r
 	{
-	    if (s > tail)	// remove one extension
+	    char_u *limit = *fnamep;
+
+	    if (limit < tail)
+		limit = tail;
+	    if (s > limit)	// remove one extension
 		*fnamelen = (int)(s - *fnamep);
 	}
 	*usedlen += 2;

src/testdir/test_fnamemodify.vim

diff --git a/src/testdir/test_fnamemodify.vim b/src/testdir/test_fnamemodify.vim
index fd5f1ef..a8324ab 100644
--- a/src/testdir/test_fnamemodify.vim
+++ b/src/testdir/test_fnamemodify.vim
@@ -45,3 +45,31 @@
   let $HOME = save_home
   let &shell = save_shell
 endfunc
+
+func Test_fnamemodify_er()
+  call assert_equal("with", fnamemodify("path/to/file.with.extensions", ':e:e:r:r'))
+
+  call assert_equal('c', fnamemodify('a.c', ':e'))
+  call assert_equal('c', fnamemodify('a.c', ':e:e'))
+  call assert_equal('c', fnamemodify('a.c', ':e:e:r'))
+  call assert_equal('c', fnamemodify('a.c', ':e:e:r:r'))
+
+  call assert_equal('rb', fnamemodify('a.spec.rb', ':e:r'))
+  call assert_equal('rb', fnamemodify('a.spec.rb', ':e:r'))
+  call assert_equal('spec.rb', fnamemodify('a.spec.rb', ':e:e'))
+  call assert_equal('spec', fnamemodify('a.spec.rb', ':e:e:r'))
+  call assert_equal('spec', fnamemodify('a.spec.rb', ':e:e:r:r'))
+  call assert_equal('spec', fnamemodify('a.b.spec.rb', ':e:e:r'))
+  call assert_equal('b.spec', fnamemodify('a.b.spec.rb', ':e:e:e:r'))
+  call assert_equal('b', fnamemodify('a.b.spec.rb', ':e:e:e:r:r'))
+
+  call assert_equal('spec', fnamemodify('a.b.spec.rb', ':r:e'))
+  call assert_equal('b', fnamemodify('a.b.spec.rb', ':r:r:e'))
+
+  call assert_equal('c', fnamemodify('a.b.c.d.e', ':r:r:e'))
+  call assert_equal('b.c', fnamemodify('a.b.c.d.e', ':r:r:e:e'))
+
+  " :e never includes the whole filename, so "a.b":e:e:e --> "b"
+  call assert_equal('b.c', fnamemodify('a.b.c.d.e', ':r:r:e:e:e'))
+  call assert_equal('b.c', fnamemodify('a.b.c.d.e', ':r:r:e:e:e:e'))
+endfunc

src/version.c

diff --git a/src/version.c b/src/version.c
index 514f3c9..a7a7869 100644
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2125,
+/**/
     2124,
 /**/
     2123,