Merge #11414 from janlazo/vim-8.1.2312

vim-patch:8.1.{2312,2314,2317}

5 files changed, 69 insertions, 3 deletions

diff --git a/src/nvim/search.c b/src/nvim/search.c
index d396e7551b..a298f7333e 100644
--- a/src/nvim/search.c
+++ b/src/nvim/search.c
@@ -3808,8 +3808,9 @@ current_quote(
     }
 
     vis_bef_curs = lt(VIsual, curwin->w_cursor);
+    vis_empty = equalpos(VIsual, curwin->w_cursor);
     if (*p_sel == 'e') {
-      if (!vis_bef_curs) {
+      if (!vis_bef_curs && !vis_empty) {
         // VIsual needs to be start of Visual selection.
         pos_T t = curwin->w_cursor;
 
@@ -3819,8 +3820,8 @@ current_quote(
         restore_vis_bef = true;
       }
       dec_cursor();
+      vis_empty = equalpos(VIsual, curwin->w_cursor);
     }
-    vis_empty = equalpos(VIsual, curwin->w_cursor);
   }
 
   if (!vis_empty) {
diff --git a/src/nvim/tag.c b/src/nvim/tag.c
index a3967c70b5..9e8c05fb1e 100644
--- a/src/nvim/tag.c
+++ b/src/nvim/tag.c
@@ -65,6 +65,7 @@ typedef struct tag_pointers {
   char_u  *tagkind_end;  // end of tagkind
   char_u  *user_data;  // user_data string
   char_u  *user_data_end;  // end of user_data
+  linenr_T tagline;        // "line:" value
 } tagptrs_T;
 
 /*
@@ -2545,6 +2546,7 @@ parse_match(
 
   tagp->tagkind = NULL;
   tagp->user_data = NULL;
+  tagp->tagline = 0;
   tagp->command_end = NULL;
 
   if (retval == OK) {
@@ -2564,6 +2566,8 @@ parse_match(
             tagp->tagkind = p + 5;
           } else if (STRNCMP(p, "user_data:", 10) == 0) {
             tagp->user_data = p + 10;
+          } else if (STRNCMP(p, "line:", 5) == 0) {
+            tagp->tagline = atoi((char *)p + 5);
           }
           if (tagp->tagkind != NULL && tagp->user_data != NULL) {
             break;
@@ -2811,7 +2815,13 @@ static int jumpto_tag(
       p_ic = FALSE;             /* don't ignore case now */
       p_scs = FALSE;
       save_lnum = curwin->w_cursor.lnum;
-      curwin->w_cursor.lnum = 0;        /* start search before first line */
+      if (tagp.tagline > 0) {
+        // start search before line from "line:" field
+        curwin->w_cursor.lnum = tagp.tagline - 1;
+      } else {
+        // start search before first line
+        curwin->w_cursor.lnum = 0;
+      }
       if (do_search(NULL, pbuf[0], pbuf + 1, (long)1,
                     search_options, NULL)) {
         retval = OK;
diff --git a/src/nvim/testdir/test_spell.vim b/src/nvim/testdir/test_spell.vim
index 9dce87774b..e2016d7927 100644
--- a/src/nvim/testdir/test_spell.vim
+++ b/src/nvim/testdir/test_spell.vim
@@ -320,6 +320,19 @@ func Test_zz_Numbers()
         \ ])
 endfunc
 
+" Affix flags
+func Test_zz_affix_flags()
+  call LoadAffAndDic(g:test_data_aff10, g:test_data_dic10)
+  call RunGoodBad("drink drinkable drinkables drinktable drinkabletable",
+	\ "bad: drinks drinkstable drinkablestable",
+        \ ["drink", "drinkable", "drinkables", "table"],
+        \ [['bad', []],
+	\ ['drinks', ['drink']],
+	\ ['drinkstable', ['drinktable', 'drinkable', 'drink table']],
+        \ ['drinkablestable', ['drinkabletable', 'drinkables table', 'drinkable table']],
+	\ ])
+endfunc
+
 function FirstSpellWord()
   call feedkeys("/^start:\n", 'tx')
   normal ]smm
@@ -751,6 +764,21 @@ let g:test_data_dic9 = [
       \"foo",
       \"bar",
       \ ]
+let g:test_data_aff10 = [
+      \"COMPOUNDRULE se",
+      \"COMPOUNDPERMITFLAG p",
+      \"",
+      \"SFX A Y 1",
+      \"SFX A 0 able/Mp .",
+      \"",
+      \"SFX M Y 1",
+      \"SFX M 0 s .",
+      \ ]
+let g:test_data_dic10 = [
+      \"1234",
+      \"drink/As",
+      \"table/e",
+      \ ]
 let g:test_data_aff_sal = [
       \"SET ISO8859-1",
       \"TRY esianrtolcdugmphbyfvkwjkqxz-\xEB\xE9\xE8\xEA\xEF\xEE\xE4\xE0\xE2\xF6\xFC\xFB'ESIANRTOLCDUGMPHBYFVKWJKQXZ",
diff --git a/src/nvim/testdir/test_tagjump.vim b/src/nvim/testdir/test_tagjump.vim
index ce527a5e1d..f93af76f17 100644
--- a/src/nvim/testdir/test_tagjump.vim
+++ b/src/nvim/testdir/test_tagjump.vim
@@ -466,4 +466,28 @@ func Test_tag_line_toolong()
   let &verbose = old_vbs
 endfunc
 
+func Test_tagline()
+  call writefile([
+	\ 'provision	Xtest.py	/^    def provision(self, **kwargs):$/;"	m	line:1	language:Python class:Foo',
+	\ 'provision	Xtest.py	/^    def provision(self, **kwargs):$/;"	m	line:3	language:Python class:Bar',
+	\], 'Xtags')
+  call writefile([
+	\ '    def provision(self, **kwargs):',
+	\ '        pass',
+	\ '    def provision(self, **kwargs):',
+	\ '        pass',
+	\], 'Xtest.py')
+
+  set tags=Xtags
+
+  1tag provision
+  call assert_equal(line('.'), 1)
+  2tag provision
+  call assert_equal(line('.'), 3)
+
+  call delete('Xtags')
+  call delete('Xtest.py')
+  set tags&
+endfunc
+
 " vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/nvim/testdir/test_textobjects.vim b/src/nvim/testdir/test_textobjects.vim
index 9194e0014d..448b2dc51c 100644
--- a/src/nvim/testdir/test_textobjects.vim
+++ b/src/nvim/testdir/test_textobjects.vim
@@ -48,6 +48,9 @@ func Test_quote_selection_selection_exclusive()
   set selection=exclusive
   exe "norm! fdvhi'y"
   call assert_equal('bcde', @")
+  let @"='dummy'
+  exe "norm! $gevi'y"
+  call assert_equal('bcde', @")
   set selection&vim
   bw!
 endfunc