patch 8.2.3462: ModeChanged only uses one character for new_mode and old_mode

Problem:    The ModeChanged event only uses one character for the new_mode and
            old_mode values.
Solution:   Pass one as first argument to mode(). (issue #8856)

diff --git a/src/misc1.c b/src/misc1.c
index b4a4a8cc75f7b41b75c541de29e3f1c29b19c930..8e21f1ec91ba4302c062a87d49169f8e23e00ff9 100644 (file)
--- a/src/misc1.c
+++ b/src/misc1.c
@@ -2657,7 +2657,7 @@ trigger_modechanged()
 #if defined(FEAT_EVAL) || defined(PROTO)
     dict_T         *v_event;
     typval_T       rettv;
-    typval_T       tv;
+    typval_T       tv[2];
     char_u         *pat_pre;
     char_u         *pat;
 
@@ -2666,8 +2666,10 @@ trigger_modechanged()
 
     v_event = get_vim_var_dict(VV_EVENT);
 
-    tv.v_type = VAR_UNKNOWN;
-    f_mode(&tv, &rettv);
+    tv[0].v_type = VAR_NUMBER;
+    tv[0].vval.v_number = 1;       // get full mode
+    tv[1].v_type = VAR_UNKNOWN;
+    f_mode(tv, &rettv);
     (void)dict_add_string(v_event, "new_mode", rettv.vval.v_string);
     (void)dict_add_string(v_event, "old_mode", last_mode);
     dict_set_items_ro(v_event);

diff --git a/src/testdir/test_edit.vim b/src/testdir/test_edit.vim
index 79ba969b1c26c711cc57b923f644cdcc136c5abd..20683ef954c9391dd5aaf455b7d4b0d20594a78a 100644 (file)
--- a/src/testdir/test_edit.vim
+++ b/src/testdir/test_edit.vim
@@ -1918,7 +1918,7 @@ func Test_mode_changes()
   func! TestMode()
     call assert_equal(g:mode_seq[g:index], get(v:event, "old_mode"))
     call assert_equal(g:mode_seq[g:index + 1], get(v:event, "new_mode"))
-    call assert_equal(mode(), get(v:event, "new_mode"))
+    call assert_equal(mode(1), get(v:event, "new_mode"))
     let g:index += 1
   endfunc
 
@@ -1930,7 +1930,11 @@ func Test_mode_changes()
   au ModeChanged V:v :call DoIt()
   call feedkeys("Vv\<esc>", 'tnix')
   call assert_equal(4, g:count)
+  call assert_equal(len(g:mode_seq) - 1, g:index)
 
+  let g:index = 0
+  let g:mode_seq = ['n', 'i', 'niI', 'i', 'n']
+  call feedkeys("a\<C-O>l\<esc>", 'tnix')
   call assert_equal(len(g:mode_seq) - 1, g:index)
 
   au! ModeChanged

diff --git a/src/version.c b/src/version.c
index 57865cdeda9d1566bbdf5150334ab59c166afc73..27e8365f3b3d61ec8b2f5b4fb4750cc49a500669 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -757,6 +757,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    3462,
 /**/
     3461,
 /**/