From 69bc47958ce6bcdd0a5912de13ac4a742a6dd736 Mon Sep 17 00:00:00 2001 From: Kassio Borges Date: Mon, 31 Mar 2014 17:36:59 -0300 Subject: [PATCH] Remove support to ack 1.x --- README.md | 1 + autoload/ack.vim | 5 +---- plugin/ack.vim | 2 -- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index fd73dde3..a8a9db6f 100644 --- a/README.md +++ b/README.md @@ -76,6 +76,7 @@ check out the docs for the Perl script 'ack', for obvious reasons: ### 1.0 +* Remove support to ack 1.x * Start to use a Changelog * Use `autoload` directory to define functions, instead of `plugin`. * Add option to auto fold the results(`g:ack_autofold_results`) diff --git a/autoload/ack.vim b/autoload/ack.vim index a9198419..d9ce45dd 100644 --- a/autoload/ack.vim +++ b/autoload/ack.vim @@ -13,10 +13,7 @@ function! ack#Ack(cmd, args) " Format, used to manage column jump if a:cmd =~# '-g$' let g:ackformat="%f" - if s:ackprg_version > 2 - " remove arguments that conflict with -g - let l:ackprg_run = substitute(l:ackprg_run, '-H\|--column', '', 'g') - endif + let l:ackprg_run = substitute(l:ackprg_run, '-H\|--column', '', 'g') else let g:ackformat="%f:%l:%c:%m,%f:%l:%m" endif diff --git a/plugin/ack.vim b/plugin/ack.vim index 9a50c1a3..e4918e0b 100644 --- a/plugin/ack.vim +++ b/plugin/ack.vim @@ -10,8 +10,6 @@ if !exists("g:ackprg") let g:ackprg .= " -s -H --nocolor --nogroup --column" endif -let s:ackprg_version = eval(matchstr(system(g:ackprg . " --version"), '[0-9.]\+')) - if !exists("g:ack_apply_qmappings") let g:ack_apply_qmappings = !exists("g:ack_qhandler") endif