# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1570570205 -7200
# Node ID 8d09b7f53c7130477db8e8e0e0d2d124f8fa609e
# Parent  395b4d97da2a511d22ef670e5151c7de8f953e08
patch 8.1.2125: fnamemodify() fails when repeating :e

Commit: https://github.com/vim/vim/commit/b189295b72030f00c45c30d3daecf85d457221f8
Author: Bram Moolenaar <Bram@vim.org>
Date:   Tue Oct 8 23:26:50 2019 +0200

    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 https://github.com/vim/vim/issues/5024)

diff --git a/src/filepath.c b/src/filepath.c
--- a/src/filepath.c
+++ b/src/filepath.c
@@ -563,7 +563,11 @@ repeat:
 	}
 	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;
diff --git a/src/testdir/test_fnamemodify.vim b/src/testdir/test_fnamemodify.vim
--- a/src/testdir/test_fnamemodify.vim
+++ b/src/testdir/test_fnamemodify.vim
@@ -45,3 +45,31 @@ func Test_fnamemodify()
   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
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2125,
+/**/
     2124,
 /**/
     2123,