To: vim_dev@googlegroups.com Subject: Patch 7.4.1686 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 7.4.1686 Problem: When running tests $HOME/.viminfo is written. (James McCoy) Solution: Add 'nviminfo' to the 'viminfo' option. (closes #722) Files: src/testdir/test_backspace_opt.vim, src/testdir/test_viminfo.vim, src/testdir/runtest.vim *** ../vim-7.4.1685/src/testdir/test_backspace_opt.vim 2016-03-15 16:53:23.001134942 +0100 --- src/testdir/test_backspace_opt.vim 2016-03-30 20:36:38.674311769 +0200 *************** *** 53,59 **** " Cleared when 'compatible' is set set compatible call assert_equal('', &backspace) ! set nocompatible endfunc " vim: tabstop=2 shiftwidth=0 expandtab --- 53,59 ---- " Cleared when 'compatible' is set set compatible call assert_equal('', &backspace) ! set nocompatible viminfo+=nviminfo endfunc " vim: tabstop=2 shiftwidth=0 expandtab *** ../vim-7.4.1685/src/testdir/test_viminfo.vim 2016-01-18 23:28:44.161810727 +0100 --- src/testdir/test_viminfo.vim 2016-03-30 20:44:00.853795057 +0200 *************** *** 36,42 **** " store a really long list, so line wrapping will occur in viminfo file let test_list = range(1,100) let g:MY_GLOBAL_LIST = test_list ! set viminfo='100,<50,s10,h,! wv! Xviminfo unlet g:MY_GLOBAL_DICT unlet g:MY_GLOBAL_LIST --- 36,42 ---- " store a really long list, so line wrapping will occur in viminfo file let test_list = range(1,100) let g:MY_GLOBAL_LIST = test_list ! set viminfo='100,<50,s10,h,!,nviminfo wv! Xviminfo unlet g:MY_GLOBAL_DICT unlet g:MY_GLOBAL_LIST *** ../vim-7.4.1685/src/testdir/runtest.vim 2016-03-03 13:10:41.048418154 +0100 --- src/testdir/runtest.vim 2016-03-30 20:42:50.362515766 +0200 *************** *** 55,60 **** --- 55,63 ---- " Always use forward slashes. set shellslash + " Make sure $HOME does not get read or written. + let $HOME = '/does/not/exist' + let s:srcdir = expand('%:p:h:h') " Support function: get the alloc ID by name. *************** *** 141,147 **** call extend(s:errors, v:errors) let v:errors = [] endif - endfor if s:fail == 0 --- 144,149 ---- *** ../vim-7.4.1685/src/version.c 2016-03-29 23:10:14.014448074 +0200 --- src/version.c 2016-03-30 20:41:14.695493994 +0200 *************** *** 750,751 **** --- 750,753 ---- { /* Add new patch number below this line */ + /**/ + 1686, /**/ -- "Hit any key to continue" is a lie. /// 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 ///