Skip to content

Commit

Permalink
Merge branch 'release/1.1.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
Olical committed Jul 30, 2014
2 parents 02929c9 + 74bd2ab commit c685c08
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 5 deletions.
11 changes: 10 additions & 1 deletion .travis.yml
@@ -1,4 +1,13 @@
language: vim

before_script: |
git clone https://github.com/junegunn/vader.vim.git
script: |
./test/run
vim -Nu <(cat << VIMRC
filetype off
set rtp+=vader.vim
set rtp+=.
set rtp+=after
filetype plugin indent on
VIMRC) -c 'Vader! test/*.vader' > /dev/null
7 changes: 4 additions & 3 deletions autoload/enmasse.vim
Expand Up @@ -10,7 +10,7 @@ function! enmasse#Open()
endfunction

function! enmasse#GetVersion()
return "1.1.0"
return "1.1.1"
endfunction

function! enmasse#WriteCurrentBuffer()
Expand Down Expand Up @@ -97,13 +97,14 @@ function! s:GetLineFromFile(file, line)
endfunction

function! s:CreateEnMasseBuffer(list, sourceLines)
new __EnMasse__
new! __EnMasse__
setlocal buftype=acwrite
setlocal bufhidden=hide
setlocal noswapfile
normal ggdG
call setbufvar(bufnr(''), "enMasseList", a:list)
call append(0, a:sourceLines)
normal dGgg
normal ddgg
nmap <silent><buffer> <CR> :call <SID>OpenLineInPreviewWindow()<CR>
set nomodified
call enmasse#DisplayQuickfixEntryForCurrentLine()
Expand Down
12 changes: 12 additions & 0 deletions test/clearing.vader
@@ -0,0 +1,12 @@
Execute (the line counts are correct):
silent grep! -i a test/grepable.txt
EnMasse
let before = line("$")
normal G
quit
silent grep! -i b test/grepable.txt
EnMasse
let after = line("$")

AssertEqual 5, before
AssertEqual 2, after
2 changes: 1 addition & 1 deletion test/run
Expand Up @@ -10,7 +10,7 @@ fi

vim -Nu <(cat << VIMRC
filetype off
set rtp+=.
set rtp=.
set rtp+=test/vader
filetype plugin indent on
VIMRC) -c 'Vader! test/*.vader' > /dev/null

0 comments on commit c685c08

Please sign in to comment.