vim-patch:7.4.1150

Problem:    'langmap' applies to the first character typed in Select mode.
            (David Watson)
Solution:   Check for SELECTMODE. (Christian Brabandt, closes #572)
            Add the 'x' flag to feedkeys().

https://github.com/vim/vim/commit/25281634cda03ce302aaf9f906a9520b5f81f91e

6 files changed, 40 insertions, 12 deletions

diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c
index dea52ee112..c0d5c37bc9 100644
--- a/src/nvim/ex_docmd.c
+++ b/src/nvim/ex_docmd.c
@@ -7858,19 +7858,21 @@ static void ex_stopinsert(exarg_T *eap)
  */
 void exec_normal_cmd(char_u *cmd, int remap, bool silent)
 {
+  // Stuff the argument into the typeahead buffer.
+  ins_typebuf(cmd, remap, 0, true, silent);
+  exec_normal(false);
+}
+
+void exec_normal(int was_typed)
+{
   oparg_T oa;
 
-  /*
-   * Stuff the argument into the typeahead buffer.
-   * Execute normal_cmd() until there is no typeahead left.
-   */
   clear_oparg(&oa);
-  finish_op = FALSE;
-  ins_typebuf(cmd, remap, 0, TRUE, silent);
-  while ((!stuff_empty() || (!typebuf_typed() && typebuf.tb_len > 0))
-         && !got_int) {
+  finish_op = false;
+  while ((!stuff_empty() || ((was_typed || !typebuf_typed())
+         && typebuf.tb_len > 0)) && !got_int) {
     update_topline_cursor();
-    normal_cmd(&oa, TRUE);      /* execute a Normal mode cmd */
+    normal_cmd(&oa, true);      // execute a Normal mode cmd
   }
 }
 
diff --git a/src/nvim/getchar.c b/src/nvim/getchar.c
index dbf0322d78..36fe393f18 100644
--- a/src/nvim/getchar.c
+++ b/src/nvim/getchar.c
@@ -1757,7 +1757,8 @@ static int vgetorpeek(int advance)
             if (c1 == K_SPECIAL)
               nolmaplen = 2;
             else {
-              LANGMAP_ADJUST(c1, (State & (CMDLINE | INSERT)) == 0);
+              LANGMAP_ADJUST(c1, (State & (CMDLINE | INSERT)) == 0
+                             && get_real_state() != SELECTMODE);
               nolmaplen = 0;
             }
             /* First try buffer-local mappings. */
diff --git a/src/nvim/normal.c b/src/nvim/normal.c
index cc604352e1..d4055ac1ef 100644
--- a/src/nvim/normal.c
+++ b/src/nvim/normal.c
@@ -974,7 +974,7 @@ static int normal_execute(VimState *state, int key)
   s->old_col = curwin->w_curswant;
   s->c = key;
 
-  LANGMAP_ADJUST(s->c, true);
+  LANGMAP_ADJUST(s->c, get_real_state() != SELECTMODE);
 
   // If a mapping was started in Visual or Select mode, remember the length
   // of the mapping.  This is used below to not return to Insert mode for as
diff --git a/src/nvim/testdir/Makefile b/src/nvim/testdir/Makefile
index b06efc9ffb..b9ec1cfb2c 100644
--- a/src/nvim/testdir/Makefile
+++ b/src/nvim/testdir/Makefile
@@ -38,6 +38,7 @@ SCRIPTS := \
 NEW_TESTS = \
 	    test_cursor_func.res \
 	    test_help_tagjump.res \
+	    test_langmap.res \
 	    test_menu.res \
 	    test_syntax.res \
 	    test_timers.res \
diff --git a/src/nvim/testdir/test_langmap.vim b/src/nvim/testdir/test_langmap.vim
new file mode 100644
index 0000000000..fc7c6734b1
--- /dev/null
+++ b/src/nvim/testdir/test_langmap.vim
@@ -0,0 +1,24 @@
+" tests for 'langmap'

+

+func Test_langmap()

+  new

+  set langmap=}l,^x,%v

+

+  call setline(1, ['abc'])

+  call feedkeys('gg0}^', 'tx')

+  call assert_equal('ac', getline(1))

+

+  " in Replace mode

+  " need silent! to avoid a delay when entering Insert mode

+  call setline(1, ['abcde'])

+  silent! call feedkeys("gg0lR%{z\<Esc>00", 'tx')

+  call assert_equal('a%{ze', getline(1))

+

+  " in Select mode

+  " need silent! to avoid a delay when entering Insert mode

+  call setline(1, ['abcde'])

+  silent! call feedkeys("gg0}%}\<C-G>}^\<Esc>00", 'tx')

+  call assert_equal('a}^de', getline(1))

+

+  quit!

+endfunc

diff --git a/src/nvim/version.c b/src/nvim/version.c
index 0f51f4af6e..b354c2eaeb 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -543,7 +543,7 @@ static int included_patches[] = {
   // 1153,
   // 1152 NA
   // 1151,
-  // 1150,
+  1150,
   1149,
   // 1148 NA
   // 1147,