|
 |
3ef2ca |
To: vim_dev@googlegroups.com
|
|
|
3ef2ca |
Subject: Patch 7.4.561
|
|
|
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.561
|
|
|
3ef2ca |
Problem: Ex range handling is wrong for buffer-local user commands.
|
|
|
3ef2ca |
Solution: Check for CMD_USER_BUF. (Marcin Szamotulski)
|
|
|
3ef2ca |
Files: src/ex_docmd.c, src/testdir/test_command_count.in,
|
|
|
3ef2ca |
src/testdir/test_command_count.ok
|
|
|
3ef2ca |
|
|
|
3ef2ca |
|
|
|
3ef2ca |
*** ../vim-7.4.560/src/ex_docmd.c 2014-12-08 04:16:26.265702875 +0100
|
|
|
3ef2ca |
--- src/ex_docmd.c 2015-01-07 13:11:45.740538584 +0100
|
|
|
3ef2ca |
***************
|
|
|
3ef2ca |
*** 2133,2144 ****
|
|
|
3ef2ca |
if (ea.cmdidx != CMD_SIZE
|
|
|
3ef2ca |
#ifdef FEAT_USR_CMDS
|
|
|
3ef2ca |
&& ea.cmdidx != CMD_USER
|
|
|
3ef2ca |
#endif
|
|
|
3ef2ca |
)
|
|
|
3ef2ca |
ea.addr_type = cmdnames[(int)ea.cmdidx].cmd_addr_type;
|
|
|
3ef2ca |
else
|
|
|
3ef2ca |
#ifdef FEAT_USR_CMDS
|
|
|
3ef2ca |
! if (ea.cmdidx != CMD_USER)
|
|
|
3ef2ca |
#endif
|
|
|
3ef2ca |
ea.addr_type = ADDR_LINES;
|
|
|
3ef2ca |
/* ea.addr_type for user commands is set by find_ucmd */
|
|
|
3ef2ca |
--- 2133,2145 ----
|
|
|
3ef2ca |
if (ea.cmdidx != CMD_SIZE
|
|
|
3ef2ca |
#ifdef FEAT_USR_CMDS
|
|
|
3ef2ca |
&& ea.cmdidx != CMD_USER
|
|
|
3ef2ca |
+ && ea.cmdidx != CMD_USER_BUF
|
|
|
3ef2ca |
#endif
|
|
|
3ef2ca |
)
|
|
|
3ef2ca |
ea.addr_type = cmdnames[(int)ea.cmdidx].cmd_addr_type;
|
|
|
3ef2ca |
else
|
|
|
3ef2ca |
#ifdef FEAT_USR_CMDS
|
|
|
3ef2ca |
! if (ea.cmdidx != CMD_USER && ea.cmdidx != CMD_USER_BUF)
|
|
|
3ef2ca |
#endif
|
|
|
3ef2ca |
ea.addr_type = ADDR_LINES;
|
|
|
3ef2ca |
/* ea.addr_type for user commands is set by find_ucmd */
|
|
|
3ef2ca |
*** ../vim-7.4.560/src/testdir/test_command_count.in 2014-12-08 04:16:26.249703054 +0100
|
|
|
3ef2ca |
--- src/testdir/test_command_count.in 2015-01-07 13:12:34.099980778 +0100
|
|
|
3ef2ca |
***************
|
|
|
3ef2ca |
*** 3,9 ****
|
|
|
3ef2ca |
STARTTEST
|
|
|
3ef2ca |
:let g:lines = []
|
|
|
3ef2ca |
:so tiny.vim
|
|
|
3ef2ca |
! :com -range RangeLines :call add(g:lines, 'Rangeg:Lines '.<line1>.' '.<line2>)
|
|
|
3ef2ca |
:com -range -addr=arguments RangeArguments :call add(g:lines, 'RangeArguments '.<line1>.' '.<line2>)
|
|
|
3ef2ca |
:com -range=% -addr=arguments RangeArgumentsAll :call add(g:lines, 'RangeArgumentsAll '.<line1>.' '.<line2>)
|
|
|
3ef2ca |
:com -range -addr=loaded_buffers RangeLoadedBuffers :call add(g:lines, 'RangeLoadedBuffers '.<line1>.' '.<line2>)
|
|
|
3ef2ca |
--- 3,9 ----
|
|
|
3ef2ca |
STARTTEST
|
|
|
3ef2ca |
:let g:lines = []
|
|
|
3ef2ca |
:so tiny.vim
|
|
|
3ef2ca |
! :com -range=% RangeLines :call add(g:lines, 'RangeLines '.<line1>.' '.<line2>)
|
|
|
3ef2ca |
:com -range -addr=arguments RangeArguments :call add(g:lines, 'RangeArguments '.<line1>.' '.<line2>)
|
|
|
3ef2ca |
:com -range=% -addr=arguments RangeArgumentsAll :call add(g:lines, 'RangeArgumentsAll '.<line1>.' '.<line2>)
|
|
|
3ef2ca |
:com -range -addr=loaded_buffers RangeLoadedBuffers :call add(g:lines, 'RangeLoadedBuffers '.<line1>.' '.<line2>)
|
|
|
3ef2ca |
***************
|
|
|
3ef2ca |
*** 42,47 ****
|
|
|
3ef2ca |
--- 42,53 ----
|
|
|
3ef2ca |
:%RangeTabs
|
|
|
3ef2ca |
:RangeTabsAll
|
|
|
3ef2ca |
:1tabonly
|
|
|
3ef2ca |
+ :s/\n/\r\r\r\r\r/
|
|
|
3ef2ca |
+ :2ma<
|
|
|
3ef2ca |
+ :$-ma>
|
|
|
3ef2ca |
+ :'<,'>RangeLines
|
|
|
3ef2ca |
+ :com -range=% -buffer LocalRangeLines :call add(g:lines, 'LocalRangeLines '.<line1>.' '.<line2>)
|
|
|
3ef2ca |
+ :'<,'>LocalRangeLines
|
|
|
3ef2ca |
:e! test.out
|
|
|
3ef2ca |
:call append(0, g:lines)
|
|
|
3ef2ca |
:w|qa!
|
|
|
3ef2ca |
*** ../vim-7.4.560/src/testdir/test_command_count.ok 2014-12-08 04:16:26.249703054 +0100
|
|
|
3ef2ca |
--- src/testdir/test_command_count.ok 2015-01-07 12:59:08.657271709 +0100
|
|
|
3ef2ca |
***************
|
|
|
3ef2ca |
*** 14,17 ****
|
|
|
3ef2ca |
--- 14,19 ----
|
|
|
3ef2ca |
RangeTabs 2 5
|
|
|
3ef2ca |
RangeTabs 1 5
|
|
|
3ef2ca |
RangeTabsAll 1 5
|
|
|
3ef2ca |
+ RangeLines 2 5
|
|
|
3ef2ca |
+ LocalRangeLines 2 5
|
|
|
3ef2ca |
|
|
|
3ef2ca |
*** ../vim-7.4.560/src/version.c 2014-12-17 21:00:44.989871256 +0100
|
|
|
3ef2ca |
--- src/version.c 2015-01-07 12:58:04.754008894 +0100
|
|
|
3ef2ca |
***************
|
|
|
3ef2ca |
*** 743,744 ****
|
|
|
3ef2ca |
--- 743,746 ----
|
|
|
3ef2ca |
{ /* Add new patch number below this line */
|
|
|
3ef2ca |
+ /**/
|
|
|
3ef2ca |
+ 561,
|
|
|
3ef2ca |
/**/
|
|
|
3ef2ca |
|
|
|
3ef2ca |
--
|
|
|
3ef2ca |
Q: What is a patch 22?
|
|
|
3ef2ca |
A: A patch you need to include to make it possible to include patches.
|
|
|
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 ///
|