From ab16c07584ab4a5bc48784dde3b9b46d30e5e4a0 Mon Sep 17 00:00:00 2001
From: lonerover <pathfinder1644@yahoo.com>
Date: Wed, 22 Mar 2017 08:28:03 +0800
Subject: vim-patch:7.4.2283

Problem:    Part of ":oldfiles" command isn't cleared. (Lifepillar)
Solution:   Clear the rest of the line. (closes 1018)

https://github.com/vim/vim/commit/885c00eabe6d1fd757d4f0eb531ad3a15a35ec04
---
 src/nvim/eval.c    | 1 +
 src/nvim/version.c | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/nvim')

diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index 7eb149476f..e11b460edf 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -23628,6 +23628,7 @@ void ex_oldfiles(exarg_T *eap)
       msg_outnum(++nr);
       MSG_PUTS(": ");
       msg_outtrans(get_tv_string(&li->li_tv));
+      msg_clr_eos();
       msg_putchar('\n');
       ui_flush();                  /* output one line at a time */
       os_breakcheck();
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 39886aa9d9..e060724d81 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -158,7 +158,7 @@ static int included_patches[] = {
   // 2286 NA
   // 2285 NA
   2284,
-  // 2283,
+  2283,
   // 2282 NA
   // 2281 NA
   2280,
-- 
cgit 


From c554b53040e9fea2dce343eb11178a3352d5e8da Mon Sep 17 00:00:00 2001
From: lonerover <pathfinder1644@yahoo.com>
Date: Wed, 22 Mar 2017 08:34:04 +0800
Subject: vim-patch:7.4.2296

Problem:    No tests for :undolist and "U" command.
Solution:   Add tests. (Dominique Pelle)

https://github.com/vim/vim/commit/c628fdcd46e93c308f742efdf54248695960e290
---
 src/nvim/testdir/test_undo.vim | 33 +++++++++++++++++++++++++++++++++
 src/nvim/version.c             |  2 +-
 2 files changed, 34 insertions(+), 1 deletion(-)

(limited to 'src/nvim')

diff --git a/src/nvim/testdir/test_undo.vim b/src/nvim/testdir/test_undo.vim
index fc61d1f223..9ff73fd870 100644
--- a/src/nvim/testdir/test_undo.vim
+++ b/src/nvim/testdir/test_undo.vim
@@ -131,6 +131,39 @@ func Test_undo_del_chars()
   close!
 endfunc
 
+func Test_undolist()
+  new
+  set ul=100
+
+  let a=execute('undolist')
+  call assert_equal("\nNothing to undo", a)
+
+  " 1 leaf (2 changes).
+  call feedkeys('achange1', 'xt')
+  call feedkeys('achange2', 'xt')
+  let a=execute('undolist')
+  call assert_match("^\nnumber changes  when  *saved\n *2  *2 .*$", a)
+
+  " 2 leaves.
+  call feedkeys('u', 'xt')
+  call feedkeys('achange3\<Esc>', 'xt')
+  let a=execute('undolist')
+  call assert_match("^\nnumber changes  when  *saved\n *2  *2  *.*\n *3  *2 .*$", a)
+  close!
+endfunc
+
+func Test_U_command()
+  new
+  set ul=100
+  call feedkeys("achange1\<Esc>", 'xt')
+  call feedkeys("achange2\<Esc>", 'xt')
+  norm! U
+  call assert_equal('', getline(1))
+  norm! U
+  call assert_equal('change1change2', getline(1))
+  close!
+endfunc
+
 func Test_undojoin()
   new
   call feedkeys("Goaaaa\<Esc>", 'xt')
diff --git a/src/nvim/version.c b/src/nvim/version.c
index e060724d81..1f2c8d12f5 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -145,7 +145,7 @@ static int included_patches[] = {
   2299,
   // 2298 NA
   // 2297 NA
-  // 2296,
+  2296,
   2295,
   2294,
   2293,
-- 
cgit 


From 114a18b93588c7d5238fe66a77dc0f94a2ba5500 Mon Sep 17 00:00:00 2001
From: lonerover <pathfinder1644@yahoo.com>
Date: Wed, 22 Mar 2017 08:37:02 +0800
Subject: vim-patch:7.4.2303

Problem:    When using "is" the mode isn't always updated.
Solution:   Redraw the command line. (Christian Brabandt)

https://github.com/vim/vim/commit/779f2fc3a7468e273897d2fd0672315812a2e3da
---
 src/nvim/search.c  | 3 ++-
 src/nvim/version.c | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/nvim')

diff --git a/src/nvim/search.c b/src/nvim/search.c
index ba6c4e6548..75862e1136 100644
--- a/src/nvim/search.c
+++ b/src/nvim/search.c
@@ -3028,7 +3028,8 @@ extend:
       ++curwin->w_cursor.col;
     VIsual = start_pos;
     VIsual_mode = 'v';
-    redraw_curbuf_later(INVERTED);      /* update the inversion */
+    redraw_cmdline = true;    // show mode later
+    redraw_curbuf_later(INVERTED);      // update the inversion
   } else {
     /* include a newline after the sentence, if there is one */
     if (incl(&curwin->w_cursor) == -1)
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 1f2c8d12f5..ccd7fd21d9 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -138,7 +138,7 @@ static int included_patches[] = {
   // 2306,
   2305,
   // 2304 NA
-  // 2303,
+  2303,
   // 2302 NA
   // 2301 NA
   2300,
-- 
cgit