|
 |
22c937 |
To: vim_dev@googlegroups.com
|
|
|
22c937 |
Subject: Patch 7.4.075
|
|
|
22c937 |
Fcc: outbox
|
|
|
22c937 |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
22c937 |
Mime-Version: 1.0
|
|
|
22c937 |
Content-Type: text/plain; charset=UTF-8
|
|
|
22c937 |
Content-Transfer-Encoding: 8bit
|
|
|
22c937 |
------------
|
|
|
22c937 |
|
|
|
22c937 |
Patch 7.4.075
|
|
|
22c937 |
Problem: Locally setting 'undolevels' is not tested.
|
|
|
22c937 |
Solution: Add a test. (Christian Brabandt)
|
|
|
22c937 |
Files: src/testdir/test100.in, src/testdir/test100.ok,
|
|
|
22c937 |
src/testdir/Make_amiga.mak, src/testdir/Make_dos.mak,
|
|
|
22c937 |
src/testdir/Make_ming.mak, src/testdir/Make_os2.mak,
|
|
|
22c937 |
src/testdir/Make_vms.mms, src/testdir/Makefile, src/Makefile
|
|
|
22c937 |
|
|
|
22c937 |
|
|
|
22c937 |
*** ../vim-7.4.074/src/testdir/test100.in 2013-11-07 03:24:56.000000000 +0100
|
|
|
22c937 |
--- src/testdir/test100.in 2013-11-07 03:20:32.000000000 +0100
|
|
|
22c937 |
***************
|
|
|
22c937 |
*** 0 ****
|
|
|
22c937 |
--- 1,42 ----
|
|
|
22c937 |
+ Tests for 'undolevel' setting being global-local
|
|
|
22c937 |
+
|
|
|
22c937 |
+ STARTTEST
|
|
|
22c937 |
+ :so small.vim
|
|
|
22c937 |
+ :set nocompatible viminfo+=nviminfo ul=5
|
|
|
22c937 |
+ :fu! FillBuffer()
|
|
|
22c937 |
+ :for i in range(1,13)
|
|
|
22c937 |
+ :put=i
|
|
|
22c937 |
+ :exe "setg ul=" . &g:ul
|
|
|
22c937 |
+ :endfor
|
|
|
22c937 |
+ :endfu
|
|
|
22c937 |
+ :fu! UndoLevel()
|
|
|
22c937 |
+ :redir @a | setglobal undolevels? | echon ' global' | setlocal undolevels? | echon ' local' |redir end
|
|
|
22c937 |
+ :$put a
|
|
|
22c937 |
+ :endfu
|
|
|
22c937 |
+ :new one
|
|
|
22c937 |
+ :0put ='ONE: expecting global undolevels: 5, local undolevels: -123456 (default)'
|
|
|
22c937 |
+ :call FillBuffer()
|
|
|
22c937 |
+ :call feedkeys(":earlier 10\n", 't')
|
|
|
22c937 |
+ :call UndoLevel()
|
|
|
22c937 |
+ :%w! test.out
|
|
|
22c937 |
+ :new two
|
|
|
22c937 |
+ :0put ='TWO: expecting global undolevels: 5, local undolevels: 2 (first) then 10 (afterwards)'
|
|
|
22c937 |
+ :setlocal ul=2
|
|
|
22c937 |
+ :call FillBuffer()
|
|
|
22c937 |
+ :call feedkeys(":earlier 10\n", 't')
|
|
|
22c937 |
+ :call UndoLevel()
|
|
|
22c937 |
+ :setlocal ul=10
|
|
|
22c937 |
+ :call UndoLevel()
|
|
|
22c937 |
+ :%w >> test.out
|
|
|
22c937 |
+ :wincmd p
|
|
|
22c937 |
+ :redir >>test.out | echo "global value shouldn't be changed and still be 5!" | echo 'ONE: expecting global undolevels: 5, local undolevels: -123456 (default)'|:setglobal undolevels? | echon ' global' | setlocal undolevels? | echon ' local' |echo "" |redir end
|
|
|
22c937 |
+ :new three
|
|
|
22c937 |
+ :setglobal ul=50
|
|
|
22c937 |
+ :1put ='global value should be changed to 50'
|
|
|
22c937 |
+ :2put ='THREE: expecting global undolevels: 50, local undolevels: -123456 (default)'
|
|
|
22c937 |
+ :call UndoLevel()
|
|
|
22c937 |
+ :%w >> test.out
|
|
|
22c937 |
+ :"sleep 10
|
|
|
22c937 |
+ :qa!
|
|
|
22c937 |
+ ENDTEST
|
|
|
22c937 |
+
|
|
|
22c937 |
*** ../vim-7.4.074/src/testdir/test100.ok 2013-11-07 03:24:56.000000000 +0100
|
|
|
22c937 |
--- src/testdir/test100.ok 2013-11-07 03:11:51.000000000 +0100
|
|
|
22c937 |
***************
|
|
|
22c937 |
*** 0 ****
|
|
|
22c937 |
--- 1,41 ----
|
|
|
22c937 |
+ ONE: expecting global undolevels: 5, local undolevels: -123456 (default)
|
|
|
22c937 |
+ 1
|
|
|
22c937 |
+ 2
|
|
|
22c937 |
+ 3
|
|
|
22c937 |
+ 4
|
|
|
22c937 |
+ 5
|
|
|
22c937 |
+ 6
|
|
|
22c937 |
+ 7
|
|
|
22c937 |
+
|
|
|
22c937 |
+
|
|
|
22c937 |
+ undolevels=5 global
|
|
|
22c937 |
+ undolevels=-123456 local
|
|
|
22c937 |
+ TWO: expecting global undolevels: 5, local undolevels: 2 (first) then 10 (afterwards)
|
|
|
22c937 |
+ 1
|
|
|
22c937 |
+ 2
|
|
|
22c937 |
+ 3
|
|
|
22c937 |
+ 4
|
|
|
22c937 |
+ 5
|
|
|
22c937 |
+ 6
|
|
|
22c937 |
+ 7
|
|
|
22c937 |
+ 8
|
|
|
22c937 |
+ 9
|
|
|
22c937 |
+ 10
|
|
|
22c937 |
+
|
|
|
22c937 |
+
|
|
|
22c937 |
+ undolevels=5 global
|
|
|
22c937 |
+ undolevels=2 local
|
|
|
22c937 |
+
|
|
|
22c937 |
+ undolevels=5 global
|
|
|
22c937 |
+ undolevels=10 local
|
|
|
22c937 |
+
|
|
|
22c937 |
+ global value shouldn't be changed and still be 5!
|
|
|
22c937 |
+ ONE: expecting global undolevels: 5, local undolevels: -123456 (default)
|
|
|
22c937 |
+ undolevels=5 global
|
|
|
22c937 |
+ undolevels=-123456 local
|
|
|
22c937 |
+
|
|
|
22c937 |
+ global value should be changed to 50
|
|
|
22c937 |
+ THREE: expecting global undolevels: 50, local undolevels: -123456 (default)
|
|
|
22c937 |
+
|
|
|
22c937 |
+ undolevels=50 global
|
|
|
22c937 |
+ undolevels=-123456 local
|
|
|
22c937 |
*** ../vim-7.4.074/src/testdir/Make_amiga.mak 2013-09-19 17:00:14.000000000 +0200
|
|
|
22c937 |
--- src/testdir/Make_amiga.mak 2013-11-07 03:07:57.000000000 +0100
|
|
|
22c937 |
***************
|
|
|
22c937 |
*** 34,40 ****
|
|
|
22c937 |
test81.out test82.out test83.out test84.out test88.out \
|
|
|
22c937 |
test89.out test90.out test91.out test92.out test93.out \
|
|
|
22c937 |
test94.out test95.out test96.out test97.out test98.out \
|
|
|
22c937 |
! test99.out
|
|
|
22c937 |
|
|
|
22c937 |
.SUFFIXES: .in .out
|
|
|
22c937 |
|
|
|
22c937 |
--- 34,40 ----
|
|
|
22c937 |
test81.out test82.out test83.out test84.out test88.out \
|
|
|
22c937 |
test89.out test90.out test91.out test92.out test93.out \
|
|
|
22c937 |
test94.out test95.out test96.out test97.out test98.out \
|
|
|
22c937 |
! test99.out test100.out
|
|
|
22c937 |
|
|
|
22c937 |
.SUFFIXES: .in .out
|
|
|
22c937 |
|
|
|
22c937 |
***************
|
|
|
22c937 |
*** 150,152 ****
|
|
|
22c937 |
--- 150,153 ----
|
|
|
22c937 |
test97.out: test97.in
|
|
|
22c937 |
test98.out: test98.in
|
|
|
22c937 |
test99.out: test99.in
|
|
|
22c937 |
+ test100.out: test100.in
|
|
|
22c937 |
*** ../vim-7.4.074/src/testdir/Make_dos.mak 2013-09-19 17:00:14.000000000 +0200
|
|
|
22c937 |
--- src/testdir/Make_dos.mak 2013-11-07 03:08:05.000000000 +0100
|
|
|
22c937 |
***************
|
|
|
22c937 |
*** 32,38 ****
|
|
|
22c937 |
test79.out test80.out test81.out test82.out test83.out \
|
|
|
22c937 |
test84.out test85.out test86.out test87.out test88.out \
|
|
|
22c937 |
test89.out test90.out test91.out test92.out test93.out \
|
|
|
22c937 |
! test94.out test95.out test96.out test98.out test99.out
|
|
|
22c937 |
|
|
|
22c937 |
SCRIPTS32 = test50.out test70.out
|
|
|
22c937 |
|
|
|
22c937 |
--- 32,39 ----
|
|
|
22c937 |
test79.out test80.out test81.out test82.out test83.out \
|
|
|
22c937 |
test84.out test85.out test86.out test87.out test88.out \
|
|
|
22c937 |
test89.out test90.out test91.out test92.out test93.out \
|
|
|
22c937 |
! test94.out test95.out test96.out test98.out test99.out \
|
|
|
22c937 |
! test100.out
|
|
|
22c937 |
|
|
|
22c937 |
SCRIPTS32 = test50.out test70.out
|
|
|
22c937 |
|
|
|
22c937 |
*** ../vim-7.4.074/src/testdir/Make_ming.mak 2013-09-19 17:00:14.000000000 +0200
|
|
|
22c937 |
--- src/testdir/Make_ming.mak 2013-11-07 03:08:12.000000000 +0100
|
|
|
22c937 |
***************
|
|
|
22c937 |
*** 52,58 ****
|
|
|
22c937 |
test79.out test80.out test81.out test82.out test83.out \
|
|
|
22c937 |
test84.out test85.out test86.out test87.out test88.out \
|
|
|
22c937 |
test89.out test90.out test91.out test92.out test93.out \
|
|
|
22c937 |
! test94.out test95.out test96.out test98.out test99.out
|
|
|
22c937 |
|
|
|
22c937 |
SCRIPTS32 = test50.out test70.out
|
|
|
22c937 |
|
|
|
22c937 |
--- 52,59 ----
|
|
|
22c937 |
test79.out test80.out test81.out test82.out test83.out \
|
|
|
22c937 |
test84.out test85.out test86.out test87.out test88.out \
|
|
|
22c937 |
test89.out test90.out test91.out test92.out test93.out \
|
|
|
22c937 |
! test94.out test95.out test96.out test98.out test99.out \
|
|
|
22c937 |
! test100out
|
|
|
22c937 |
|
|
|
22c937 |
SCRIPTS32 = test50.out test70.out
|
|
|
22c937 |
|
|
|
22c937 |
*** ../vim-7.4.074/src/testdir/Make_os2.mak 2013-09-19 17:00:14.000000000 +0200
|
|
|
22c937 |
--- src/testdir/Make_os2.mak 2013-11-07 03:08:18.000000000 +0100
|
|
|
22c937 |
***************
|
|
|
22c937 |
*** 34,40 ****
|
|
|
22c937 |
test76.out test77.out test78.out test79.out test80.out \
|
|
|
22c937 |
test81.out test82.out test83.out test84.out test88.out \
|
|
|
22c937 |
test89.out test90.out test91.out test92.out test93.out \
|
|
|
22c937 |
! test94.out test95.out test96.out test98.out test99.out
|
|
|
22c937 |
|
|
|
22c937 |
.SUFFIXES: .in .out
|
|
|
22c937 |
|
|
|
22c937 |
--- 34,41 ----
|
|
|
22c937 |
test76.out test77.out test78.out test79.out test80.out \
|
|
|
22c937 |
test81.out test82.out test83.out test84.out test88.out \
|
|
|
22c937 |
test89.out test90.out test91.out test92.out test93.out \
|
|
|
22c937 |
! test94.out test95.out test96.out test98.out test99.out \
|
|
|
22c937 |
! test100.out
|
|
|
22c937 |
|
|
|
22c937 |
.SUFFIXES: .in .out
|
|
|
22c937 |
|
|
|
22c937 |
*** ../vim-7.4.074/src/testdir/Make_vms.mms 2013-09-19 17:00:14.000000000 +0200
|
|
|
22c937 |
--- src/testdir/Make_vms.mms 2013-11-07 03:08:24.000000000 +0100
|
|
|
22c937 |
***************
|
|
|
22c937 |
*** 4,10 ****
|
|
|
22c937 |
# Authors: Zoltan Arpadffy, <arpadffy@polarhome.com>
|
|
|
22c937 |
# Sandor Kopanyi, <sandor.kopanyi@mailbox.hu>
|
|
|
22c937 |
#
|
|
|
22c937 |
! # Last change: 2013 Sep 19
|
|
|
22c937 |
#
|
|
|
22c937 |
# This has been tested on VMS 6.2 to 8.3 on DEC Alpha, VAX and IA64.
|
|
|
22c937 |
# Edit the lines in the Configuration section below to select.
|
|
|
22c937 |
--- 4,10 ----
|
|
|
22c937 |
# Authors: Zoltan Arpadffy, <arpadffy@polarhome.com>
|
|
|
22c937 |
# Sandor Kopanyi, <sandor.kopanyi@mailbox.hu>
|
|
|
22c937 |
#
|
|
|
22c937 |
! # Last change: 2013 Nov 07
|
|
|
22c937 |
#
|
|
|
22c937 |
# This has been tested on VMS 6.2 to 8.3 on DEC Alpha, VAX and IA64.
|
|
|
22c937 |
# Edit the lines in the Configuration section below to select.
|
|
|
22c937 |
***************
|
|
|
22c937 |
*** 78,84 ****
|
|
|
22c937 |
test77.out test78.out test79.out test80.out test81.out \
|
|
|
22c937 |
test82.out test83.out test84.out test88.out test89.out \
|
|
|
22c937 |
test90.out test91.out test92.out test93.out test94.out \
|
|
|
22c937 |
! test95.out test96.out test97.out test98.out test99.out
|
|
|
22c937 |
|
|
|
22c937 |
# Known problems:
|
|
|
22c937 |
# Test 30: a problem around mac format - unknown reason
|
|
|
22c937 |
--- 78,85 ----
|
|
|
22c937 |
test77.out test78.out test79.out test80.out test81.out \
|
|
|
22c937 |
test82.out test83.out test84.out test88.out test89.out \
|
|
|
22c937 |
test90.out test91.out test92.out test93.out test94.out \
|
|
|
22c937 |
! test95.out test96.out test97.out test98.out test99.out \
|
|
|
22c937 |
! test100.out
|
|
|
22c937 |
|
|
|
22c937 |
# Known problems:
|
|
|
22c937 |
# Test 30: a problem around mac format - unknown reason
|
|
|
22c937 |
*** ../vim-7.4.074/src/testdir/Makefile 2013-09-22 15:03:34.000000000 +0200
|
|
|
22c937 |
--- src/testdir/Makefile 2013-11-07 03:08:31.000000000 +0100
|
|
|
22c937 |
***************
|
|
|
22c937 |
*** 30,36 ****
|
|
|
22c937 |
test84.out test85.out test86.out test87.out test88.out \
|
|
|
22c937 |
test89.out test90.out test91.out test92.out test93.out \
|
|
|
22c937 |
test94.out test95.out test96.out test97.out test98.out \
|
|
|
22c937 |
! test99.out
|
|
|
22c937 |
|
|
|
22c937 |
SCRIPTS_GUI = test16.out
|
|
|
22c937 |
|
|
|
22c937 |
--- 30,36 ----
|
|
|
22c937 |
test84.out test85.out test86.out test87.out test88.out \
|
|
|
22c937 |
test89.out test90.out test91.out test92.out test93.out \
|
|
|
22c937 |
test94.out test95.out test96.out test97.out test98.out \
|
|
|
22c937 |
! test99.out test100.out
|
|
|
22c937 |
|
|
|
22c937 |
SCRIPTS_GUI = test16.out
|
|
|
22c937 |
|
|
|
22c937 |
*** ../vim-7.4.074/src/Makefile 2013-08-10 14:21:15.000000000 +0200
|
|
|
22c937 |
--- src/Makefile 2013-11-07 03:10:40.000000000 +0100
|
|
|
22c937 |
***************
|
|
|
22c937 |
*** 1882,1888 ****
|
|
|
22c937 |
test60 test61 test62 test63 test64 test65 test66 test67 test68 test69 \
|
|
|
22c937 |
test70 test71 test72 test73 test74 test75 test76 test77 test78 test79 \
|
|
|
22c937 |
test80 test81 test82 test83 test84 test85 test86 test87 test88 test89 \
|
|
|
22c937 |
! test90 test91 test92 test93 test94 test95 test96 test97 test98 test99:
|
|
|
22c937 |
cd testdir; rm $@.out; $(MAKE) -f Makefile $@.out VIMPROG=../$(VIMTARGET)
|
|
|
22c937 |
|
|
|
22c937 |
testclean:
|
|
|
22c937 |
--- 1883,1890 ----
|
|
|
22c937 |
test60 test61 test62 test63 test64 test65 test66 test67 test68 test69 \
|
|
|
22c937 |
test70 test71 test72 test73 test74 test75 test76 test77 test78 test79 \
|
|
|
22c937 |
test80 test81 test82 test83 test84 test85 test86 test87 test88 test89 \
|
|
|
22c937 |
! test90 test91 test92 test93 test94 test95 test96 test97 test98 test99 \
|
|
|
22c937 |
! test100 test101 test102 test103 test104 test105 test106 test107:
|
|
|
22c937 |
cd testdir; rm $@.out; $(MAKE) -f Makefile $@.out VIMPROG=../$(VIMTARGET)
|
|
|
22c937 |
|
|
|
22c937 |
testclean:
|
|
|
22c937 |
*** ../vim-7.4.074/src/version.c 2013-11-07 03:04:06.000000000 +0100
|
|
|
22c937 |
--- src/version.c 2013-11-07 03:10:10.000000000 +0100
|
|
|
22c937 |
***************
|
|
|
22c937 |
*** 740,741 ****
|
|
|
22c937 |
--- 740,743 ----
|
|
|
22c937 |
{ /* Add new patch number below this line */
|
|
|
22c937 |
+ /**/
|
|
|
22c937 |
+ 75,
|
|
|
22c937 |
/**/
|
|
|
22c937 |
|
|
|
22c937 |
--
|
|
|
22c937 |
Why is "abbreviation" such a long word?
|
|
|
22c937 |
|
|
|
22c937 |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
22c937 |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
22c937 |
\\\ an exciting new programming language -- http://www.Zimbu.org ///
|
|
|
22c937 |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|