To: vim_dev@googlegroups.com Subject: Patch 7.4.2341 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 7.4.2341 Problem: Tiny things. Test doesn't clean up properly. Solution: Adjust comment and white space. Restore option value. Files: src/ex_cmds.c, src/message.c, src/testdir/test_autocmd.vim *** ../vim-7.4.2340/src/ex_cmds.c 2016-09-04 19:50:50.520985732 +0200 --- src/ex_cmds.c 2016-09-04 21:08:45.378934047 +0200 *************** *** 3947,3953 **** buf_copy_options(buf, BCO_ENTER); /* Close the link to the current buffer. This will set ! * curwin->w_buffer to NULL. */ u_sync(FALSE); close_buffer(oldwin, curbuf, (flags & ECMD_HIDE) ? 0 : DOBUF_UNLOAD, FALSE); --- 3947,3953 ---- buf_copy_options(buf, BCO_ENTER); /* Close the link to the current buffer. This will set ! * oldwin->w_buffer to NULL. */ u_sync(FALSE); close_buffer(oldwin, curbuf, (flags & ECMD_HIDE) ? 0 : DOBUF_UNLOAD, FALSE); *** ../vim-7.4.2340/src/message.c 2016-08-29 22:48:12.149106183 +0200 --- src/message.c 2016-09-01 21:36:58.197056369 +0200 *************** *** 1815,1821 **** void msg_puts(char_u *s) { ! msg_puts_attr(s, 0); } void --- 1815,1821 ---- void msg_puts(char_u *s) { ! msg_puts_attr(s, 0); } void *** ../vim-7.4.2340/src/testdir/test_autocmd.vim 2016-09-04 21:33:05.310834411 +0200 --- src/testdir/test_autocmd.vim 2016-09-05 23:19:16.762016668 +0200 *************** *** 20,25 **** --- 20,26 ---- call feedkeys('a', 'x!') call assert_equal(1, g:triggered) au! CursorHoldI + set updatetime& endfunc func Test_cursorhold_insert_ctrl_x() *************** *** 31,36 **** --- 32,38 ---- call feedkeys("a\", 'x!') call assert_equal(0, g:triggered) au! CursorHoldI + set updatetime& endfunc endif *************** *** 220,225 **** --- 222,228 ---- augroup Another augroup END call assert_true(match(execute('au VimEnter'), "-Deleted-.*VimEnter") >= 0) + augroup! Another " no warning for postpone aucmd delete augroup StartOK *** ../vim-7.4.2340/src/version.c 2016-09-06 22:06:31.325534127 +0200 --- src/version.c 2016-09-06 22:14:19.101473585 +0200 *************** *** 765,766 **** --- 765,768 ---- { /* Add new patch number below this line */ + /**/ + 2341, /**/ -- hundred-and-one symptoms of being an internet addict: 186. You overstay in the office so you can have more time surfing the net. /// 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 ///