jkunstle / rpms / vim

Forked from rpms/vim 3 years ago
Clone
3ef2ca
To: vim_dev@googlegroups.com
3ef2ca
Subject: Patch 7.4.098
3ef2ca
Fcc: outbox
3ef2ca
From: Bram Moolenaar <Bram@moolenaar.net>
3ef2ca
Mime-Version: 1.0
3ef2ca
Content-Type: text/plain; charset=UTF-8
3ef2ca
Content-Transfer-Encoding: 8bit
3ef2ca
------------
3ef2ca
3ef2ca
Patch 7.4.098
3ef2ca
Problem:    When using ":'<,'>del" errors may be given for the visual line
3ef2ca
            numbers being out of range.
3ef2ca
Solution:   Reset Visual mode in ":del". (Lech Lorens)
3ef2ca
Files:      src/ex_docmd.c, src/testdir/test103.in, src/testdir/test103.ok,
3ef2ca
            src/testdir/Make_amiga.mak, src/testdir/Make_dos.mak,
3ef2ca
            src/testdir/Make_ming.mak, src/testdir/Make_os2.mak,
3ef2ca
            src/testdir/Make_vms.mms, src/testdir/Makefile
3ef2ca
3ef2ca
3ef2ca
*** ../vim-7.4.097/src/ex_docmd.c	2013-11-09 05:30:18.000000000 +0100
3ef2ca
--- src/ex_docmd.c	2013-11-21 14:04:55.000000000 +0100
3ef2ca
***************
3ef2ca
*** 8570,8575 ****
3ef2ca
--- 8570,8580 ----
3ef2ca
  	beginline(BL_SOL | BL_FIX);
3ef2ca
      }
3ef2ca
  
3ef2ca
+ #if defined(FEAT_VISUAL)
3ef2ca
+     if (VIsual_active)
3ef2ca
+ 	end_visual_mode();
3ef2ca
+ #endif
3ef2ca
+ 
3ef2ca
      switch (eap->cmdidx)
3ef2ca
      {
3ef2ca
  	case CMD_delete:
3ef2ca
*** ../vim-7.4.097/src/testdir/test103.in	2013-11-21 14:21:12.000000000 +0100
3ef2ca
--- src/testdir/test103.in	2013-11-21 14:02:09.000000000 +0100
3ef2ca
***************
3ef2ca
*** 0 ****
3ef2ca
--- 1,37 ----
3ef2ca
+ Test for visual mode not being reset causing E315 error.
3ef2ca
+ STARTTEST
3ef2ca
+ :so small.vim
3ef2ca
+ :enew
3ef2ca
+ :let g:msg="Everything's fine."
3ef2ca
+ :function! TriggerTheProblem()
3ef2ca
+ :	" At this point there is no visual selection because :call reset it.
3ef2ca
+ :	" Let's restore the selection:
3ef2ca
+ :	normal gv
3ef2ca
+ :	'<,'>del _
3ef2ca
+ :	try
3ef2ca
+ :		exe "normal \<Esc>"
3ef2ca
+ :	catch /^Vim\%((\a\+)\)\=:E315/
3ef2ca
+ :		echom 'Snap! E315 error!'
3ef2ca
+ :		let g:msg='Snap! E315 error!'
3ef2ca
+ :	endtry
3ef2ca
+ :endfunction
3ef2ca
+ :enew
3ef2ca
+ :setl buftype=nofile
3ef2ca
+ :call append(line('$'), 'Delete this line.')
3ef2ca
+ :"
3ef2ca
+ :"
3ef2ca
+ :" NOTE: this has to be done by a call to a function because executing :del the
3ef2ca
+ :"       ex-way will require the colon operator which resets the visual mode thus
3ef2ca
+ :"       preventing the problem:
3ef2ca
+ :"
3ef2ca
+ GV:call TriggerTheProblem()
3ef2ca
+ :%del _
3ef2ca
+ :call append(line('$'), g:msg)
3ef2ca
+ :w! test.out
3ef2ca
+ :brewind
3ef2ca
+ ENDTEST
3ef2ca
+ 
3ef2ca
+ STARTTEST
3ef2ca
+ :qa!
3ef2ca
+ ENDTEST
3ef2ca
+ 
3ef2ca
*** ../vim-7.4.097/src/testdir/test103.ok	2013-11-21 14:21:12.000000000 +0100
3ef2ca
--- src/testdir/test103.ok	2013-11-21 14:02:28.000000000 +0100
3ef2ca
***************
3ef2ca
*** 0 ****
3ef2ca
--- 1,2 ----
3ef2ca
+ 
3ef2ca
+ Everything's fine.
3ef2ca
*** ../vim-7.4.097/src/testdir/Make_amiga.mak	2013-11-12 05:28:08.000000000 +0100
3ef2ca
--- src/testdir/Make_amiga.mak	2013-11-21 14:02:51.000000000 +0100
3ef2ca
***************
3ef2ca
*** 34,40 ****
3ef2ca
  		test81.out test82.out test83.out test84.out test88.out \
3ef2ca
  		test89.out test90.out test91.out test92.out test93.out \
3ef2ca
  		test94.out test95.out test96.out test97.out test98.out \
3ef2ca
! 		test99.out test100.out test101.out test102.out
3ef2ca
  
3ef2ca
  .SUFFIXES: .in .out
3ef2ca
  
3ef2ca
--- 34,40 ----
3ef2ca
  		test81.out test82.out test83.out test84.out test88.out \
3ef2ca
  		test89.out test90.out test91.out test92.out test93.out \
3ef2ca
  		test94.out test95.out test96.out test97.out test98.out \
3ef2ca
! 		test99.out test100.out test101.out test102.out test103.out
3ef2ca
  
3ef2ca
  .SUFFIXES: .in .out
3ef2ca
  
3ef2ca
***************
3ef2ca
*** 153,155 ****
3ef2ca
--- 153,156 ----
3ef2ca
  test100.out: test100.in
3ef2ca
  test101.out: test101.in
3ef2ca
  test102.out: test102.in
3ef2ca
+ test103.out: test103.in
3ef2ca
*** ../vim-7.4.097/src/testdir/Make_dos.mak	2013-11-12 05:28:08.000000000 +0100
3ef2ca
--- src/testdir/Make_dos.mak	2013-11-21 14:02:58.000000000 +0100
3ef2ca
***************
3ef2ca
*** 33,39 ****
3ef2ca
  		test84.out test85.out test86.out test87.out test88.out \
3ef2ca
  		test89.out test90.out test91.out test92.out test93.out \
3ef2ca
  		test94.out test95.out test96.out test98.out test99.out \
3ef2ca
! 		test100.out test101.out test102.out
3ef2ca
  
3ef2ca
  SCRIPTS32 =	test50.out test70.out
3ef2ca
  
3ef2ca
--- 33,39 ----
3ef2ca
  		test84.out test85.out test86.out test87.out test88.out \
3ef2ca
  		test89.out test90.out test91.out test92.out test93.out \
3ef2ca
  		test94.out test95.out test96.out test98.out test99.out \
3ef2ca
! 		test100.out test101.out test102.out test103.out
3ef2ca
  
3ef2ca
  SCRIPTS32 =	test50.out test70.out
3ef2ca
  
3ef2ca
*** ../vim-7.4.097/src/testdir/Make_ming.mak	2013-11-12 05:28:08.000000000 +0100
3ef2ca
--- src/testdir/Make_ming.mak	2013-11-21 14:03:01.000000000 +0100
3ef2ca
***************
3ef2ca
*** 53,59 ****
3ef2ca
  		test84.out test85.out test86.out test87.out test88.out \
3ef2ca
  		test89.out test90.out test91.out test92.out test93.out \
3ef2ca
  		test94.out test95.out test96.out test98.out test99.out \
3ef2ca
! 		test100out test101.out test102.out
3ef2ca
  
3ef2ca
  SCRIPTS32 =	test50.out test70.out
3ef2ca
  
3ef2ca
--- 53,59 ----
3ef2ca
  		test84.out test85.out test86.out test87.out test88.out \
3ef2ca
  		test89.out test90.out test91.out test92.out test93.out \
3ef2ca
  		test94.out test95.out test96.out test98.out test99.out \
3ef2ca
! 		test100out test101.out test102.out test103.out
3ef2ca
  
3ef2ca
  SCRIPTS32 =	test50.out test70.out
3ef2ca
  
3ef2ca
*** ../vim-7.4.097/src/testdir/Make_os2.mak	2013-11-12 05:28:08.000000000 +0100
3ef2ca
--- src/testdir/Make_os2.mak	2013-11-21 14:03:03.000000000 +0100
3ef2ca
***************
3ef2ca
*** 35,41 ****
3ef2ca
  		test81.out test82.out test83.out test84.out test88.out \
3ef2ca
  		test89.out test90.out test91.out test92.out test93.out \
3ef2ca
  		test94.out test95.out test96.out test98.out test99.out \
3ef2ca
! 		test100.out test101.out test102.out
3ef2ca
  
3ef2ca
  .SUFFIXES: .in .out
3ef2ca
  
3ef2ca
--- 35,41 ----
3ef2ca
  		test81.out test82.out test83.out test84.out test88.out \
3ef2ca
  		test89.out test90.out test91.out test92.out test93.out \
3ef2ca
  		test94.out test95.out test96.out test98.out test99.out \
3ef2ca
! 		test100.out test101.out test102.out test103.out
3ef2ca
  
3ef2ca
  .SUFFIXES: .in .out
3ef2ca
  
3ef2ca
*** ../vim-7.4.097/src/testdir/Make_vms.mms	2013-11-12 05:28:08.000000000 +0100
3ef2ca
--- src/testdir/Make_vms.mms	2013-11-21 14:03:13.000000000 +0100
3ef2ca
***************
3ef2ca
*** 4,10 ****
3ef2ca
  # Authors:	Zoltan Arpadffy, <arpadffy@polarhome.com>
3ef2ca
  #		Sandor Kopanyi,  <sandor.kopanyi@mailbox.hu>
3ef2ca
  #
3ef2ca
! # Last change:  2013 Nov 12
3ef2ca
  #
3ef2ca
  # This has been tested on VMS 6.2 to 8.3 on DEC Alpha, VAX and IA64.
3ef2ca
  # Edit the lines in the Configuration section below to select.
3ef2ca
--- 4,10 ----
3ef2ca
  # Authors:	Zoltan Arpadffy, <arpadffy@polarhome.com>
3ef2ca
  #		Sandor Kopanyi,  <sandor.kopanyi@mailbox.hu>
3ef2ca
  #
3ef2ca
! # Last change:  2013 Nov 21
3ef2ca
  #
3ef2ca
  # This has been tested on VMS 6.2 to 8.3 on DEC Alpha, VAX and IA64.
3ef2ca
  # Edit the lines in the Configuration section below to select.
3ef2ca
***************
3ef2ca
*** 79,85 ****
3ef2ca
  	 test82.out test83.out test84.out test88.out test89.out \
3ef2ca
  	 test90.out test91.out test92.out test93.out test94.out \
3ef2ca
  	 test95.out test96.out test97.out test98.out test99.out \
3ef2ca
! 	 test100.out test101.out test102.out
3ef2ca
  
3ef2ca
  # Known problems:
3ef2ca
  # Test 30: a problem around mac format - unknown reason
3ef2ca
--- 79,85 ----
3ef2ca
  	 test82.out test83.out test84.out test88.out test89.out \
3ef2ca
  	 test90.out test91.out test92.out test93.out test94.out \
3ef2ca
  	 test95.out test96.out test97.out test98.out test99.out \
3ef2ca
! 	 test100.out test101.out test102.out test103.out
3ef2ca
  
3ef2ca
  # Known problems:
3ef2ca
  # Test 30: a problem around mac format - unknown reason
3ef2ca
*** ../vim-7.4.097/src/testdir/Makefile	2013-11-12 05:28:08.000000000 +0100
3ef2ca
--- src/testdir/Makefile	2013-11-21 14:03:23.000000000 +0100
3ef2ca
***************
3ef2ca
*** 30,36 ****
3ef2ca
  		test84.out test85.out test86.out test87.out test88.out \
3ef2ca
  		test89.out test90.out test91.out test92.out test93.out \
3ef2ca
  		test94.out test95.out test96.out test97.out test98.out \
3ef2ca
! 		test99.out test100.out test101.out test102.out
3ef2ca
  
3ef2ca
  SCRIPTS_GUI = test16.out
3ef2ca
  
3ef2ca
--- 30,36 ----
3ef2ca
  		test84.out test85.out test86.out test87.out test88.out \
3ef2ca
  		test89.out test90.out test91.out test92.out test93.out \
3ef2ca
  		test94.out test95.out test96.out test97.out test98.out \
3ef2ca
! 		test99.out test100.out test101.out test102.out test103.out
3ef2ca
  
3ef2ca
  SCRIPTS_GUI = test16.out
3ef2ca
  
3ef2ca
*** ../vim-7.4.097/src/version.c	2013-11-21 13:24:36.000000000 +0100
3ef2ca
--- src/version.c	2013-11-21 14:20:34.000000000 +0100
3ef2ca
***************
3ef2ca
*** 740,741 ****
3ef2ca
--- 740,743 ----
3ef2ca
  {   /* Add new patch number below this line */
3ef2ca
+ /**/
3ef2ca
+     98,
3ef2ca
  /**/
3ef2ca
3ef2ca
-- 
3ef2ca
I recommend ordering large cargo containers of paper towels to make up
3ef2ca
whatever budget underruns you have.  Paper products are always useful and they
3ef2ca
have the advantage of being completely flushable if you need to make room in
3ef2ca
the storage area later.
3ef2ca
				(Scott Adams - The Dilbert principle)
3ef2ca
3ef2ca
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
3ef2ca
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
3ef2ca
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
3ef2ca
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///