# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1472669105 -7200
# Node ID efc8a434f38f4d38622f4341507615bdbe02c4ea
# Parent  43efa4f5a8ea9fadfd33f6c34faab5b338b53e2c
commit https://github.com/vim/vim/commit/c628fdcd46e93c308f742efdf54248695960e290
Author: Bram Moolenaar <Bram@vim.org>
Date:   Wed Aug 31 20:33:27 2016 +0200

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

diff --git a/src/testdir/test_undo.vim b/src/testdir/test_undo.vim
--- a/src/testdir/test_undo.vim
+++ b/src/testdir/test_undo.vim
@@ -129,6 +129,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/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2296,
+/**/
     2295,
 /**/
     2294,