To: vim_dev@googlegroups.com Subject: Patch 7.4.2295 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 7.4.2295 (after 7.4.2293) Problem: Cscope test fails. Solution: Avoid checking for specific line and column numbers. Files: src/testdir/test_cscope.vim *** ../vim-7.4.2294/src/testdir/test_cscope.vim 2016-08-07 14:03:10.121705270 +0200 --- src/testdir/test_cscope.vim 2016-08-30 10:54:57.311428214 +0200 *************** *** 97,103 **** for cmd in ['cs find f Xmemfile_test.c', 'cs find 7 Xmemfile_test.c'] enew let a=execute(cmd) ! call assert_match('\n"Xmemfile_test.c" 143L, 3137C', a) call assert_equal('Xmemfile_test.c', @%) endfor --- 97,103 ---- for cmd in ['cs find f Xmemfile_test.c', 'cs find 7 Xmemfile_test.c'] enew let a=execute(cmd) ! call assert_true(a =~ '"Xmemfile_test.c" \d\+L, \d\+C') call assert_equal('Xmemfile_test.c', @%) endfor *************** *** 105,111 **** for cmd in ['cs find i assert.h', 'cs find 8 assert.h'] enew let a=execute(cmd) ! call assert_equal(['','"Xmemfile_test.c" 143L, 3137C','(1 of 1): <> #include '], split(a, '\n', 1)) call assert_equal('#include ', getline('.')) endfor --- 105,114 ---- for cmd in ['cs find i assert.h', 'cs find 8 assert.h'] enew let a=execute(cmd) ! let alines = split(a, '\n', 1) ! call assert_equal('', alines[0]) ! call assert_true(alines[1] =~ '"Xmemfile_test.c" \d\+L, \d\+C') ! call assert_equal('(1 of 1): <> #include ', alines[2]) call assert_equal('#include ', getline('.')) endfor *** ../vim-7.4.2294/src/version.c 2016-08-29 23:06:25.427733586 +0200 --- src/version.c 2016-08-30 10:55:50.026988439 +0200 *************** *** 765,766 **** --- 765,768 ---- { /* Add new patch number below this line */ + /**/ + 2295, /**/ -- In a world without walls and borders, who needs windows and gates? /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///