Merge #6331 from lonerover/vim-7.4.2283

vim-patch:7.4.2283,7.4.2296,7.4.2303

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();

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)

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')

src/nvim/version.c

@@ -138,14 +138,14 @@ static int included_patches[] = {
   // 2306,
   2305,
   // 2304 NA
-  // 2303,
+  2303,
   // 2302 NA
   // 2301 NA
   2300,
   2299,
   // 2298 NA
   // 2297 NA
-  // 2296,
+  2296,
   2295,
   2294,
   2293,
@@ -158,7 +158,7 @@ static int included_patches[] = {
   // 2286 NA
   // 2285 NA
   2284,
-  // 2283,
+  2283,
   // 2282 NA
   // 2281 NA
   2280,