To: vim_dev@googlegroups.com Subject: Patch 7.4.2031 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 7.4.2031 Problem: The list_lbr_utf8 test fails if ~/.vim/syntax/c.vim sets 'textwidth' to a non-zero value. (Oyvind A. Holm) Solution: Add a setup.vim file that sets 'runtimepath' and $HOME to a safe value. (partly by Christian Brabandt, closes #912) Files: src/testdir/setup.vim, src/testdir/amiga.vim, src/testdir/dos.vim, src/testdir/unix.vim, src/testdir/vms.vim, src/testdir/runtest.vim *** ../vim-7.4.2030/src/testdir/setup.vim 2016-07-12 22:50:27.865963958 +0200 --- src/testdir/setup.vim 2016-07-12 22:42:37.640733602 +0200 *************** *** 0 **** --- 1,11 ---- + " Common preparations for running tests. + + " Make sure 'runtimepath' does not include $HOME. + set rtp=$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after + + " Only when the +eval feature is present. + if 1 + " Make sure $HOME does not get read or written. + let $HOME = '/does/not/exist' + endif + *** ../vim-7.4.2030/src/testdir/amiga.vim 2010-05-15 13:04:10.000000000 +0200 --- src/testdir/amiga.vim 2016-07-12 22:45:19.142414717 +0200 *************** *** 2,4 **** --- 2,6 ---- set shell=csh map! /tmp t: cmap !rm !Delete all + + source setup.vim *** ../vim-7.4.2030/src/testdir/dos.vim 2010-05-15 13:04:10.000000000 +0200 --- src/testdir/dos.vim 2016-07-12 22:45:23.070358313 +0200 *************** *** 5,7 **** --- 5,9 ---- if executable("cmd.exe") set shell=cmd.exe endif + + source setup.vim *** ../vim-7.4.2030/src/testdir/unix.vim 2010-05-15 13:04:10.000000000 +0200 --- src/testdir/unix.vim 2016-07-12 22:45:28.622278585 +0200 *************** *** 1,3 **** --- 1,5 ---- " Settings for test script execution " Always use "sh", don't use the value of "$SHELL". set shell=sh + + source setup.vim *** ../vim-7.4.2030/src/testdir/vms.vim 2010-05-15 13:04:10.000000000 +0200 --- src/testdir/vms.vim 2016-07-12 22:45:31.806232862 +0200 *************** *** 1,4 **** " Settings for test script execution under OpenVMS ! " Do not make any swap files set noswapfile --- 1,6 ---- " Settings for test script execution under OpenVMS ! " Do not use any swap files set noswapfile + + source setup.vim *** ../vim-7.4.2030/src/testdir/runtest.vim 2016-07-09 15:38:27.149081854 +0200 --- src/testdir/runtest.vim 2016-07-12 22:45:26.466309545 +0200 *************** *** 42,47 **** --- 42,50 ---- cquit endif + " Common with all tests on all systems. + source setup.vim + " For consistency run all tests with 'nocompatible' set. " This also enables use of line continuation. set nocp viminfo+=nviminfo *************** *** 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') " Prepare for calling test_garbagecollect_now(). --- 58,63 ---- *** ../vim-7.4.2030/src/version.c 2016-07-12 21:16:59.310461799 +0200 --- src/version.c 2016-07-12 22:47:50.296238086 +0200 *************** *** 760,761 **** --- 760,763 ---- { /* Add new patch number below this line */ + /**/ + 2031, /**/ -- Facepalm statement #4: "3000 year old graves? That's not possible, it's only 2014!" /// 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 ///