Merge branch 'release-2.0.1'

wsdjeg · Mar 12, 2015 · 8cddd0b · 8cddd0b
2 parents 640388c + 47795f9
commit 8cddd0b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/autoload/fetch.vim b/autoload/fetch.vim
@@ -182,11 +182,17 @@ function! fetch#visual(count) abort " {{{
   " adapted from http://stackoverflow.com/a/6271254/990363
   let [l:startline, l:startcol] = getpos("'<")[1:2]
   let [l:endline,   l:endcol]   = getpos("'>")[1:2]
+  let l:endcol  = min([l:endcol, col([l:endline, '$'])]) " 'V' col nr. bug
   let l:endcol -= &selection is 'inclusive' ? 0 : 1
-  let lines     = getline(l:startline, l:endline)
-  let lines[-1] = matchstr(lines[-1], '\m^.\{'.string(l:endcol).'}')
-  let lines[0]  = matchstr(lines[0],  '\m^.\{'.string(l:startcol - 1).'}\zs.*')
-  let l:selection = join(lines, "\n")
+  let l:lines   = getline(l:startline, l:endline)
+  if visualmode() isnot? 'v' " block-wise selection
+    let l:endexpr = 'matchstr(v:val, "\\m^.*\\%'.string(l:endcol).'c.\\?")'
+    call map(l:lines, 'strpart('.l:endexpr.', '.string(l:startcol-1).')')
+  else
+    let l:lines[-1] = matchstr(lines[-1], '\m^.*\%'.string(l:endcol).'c.\?')
+    let l:lines[0]  = strpart(l:lines[0], l:startcol-1)
+  endif
+  let l:selection = join(l:lines, "\n")
 
   " test for a trailing spec
   if !empty(l:selection)

diff --git a/doc/vim-fetch.txt b/doc/vim-fetch.txt
@@ -1,4 +1,4 @@
-*vim-fetch.txt*        For Vim version 7.0 or better          version 2.0.0
+*vim-fetch.txt*        For Vim version 7.0 or better          version 2.0.1
 
 
 		VIM REFERENCE for the Fetch plug-in

diff --git a/plugin/fetch.vim b/plugin/fetch.vim
@@ -1,7 +1,7 @@
 " SIMPLIFIED TAKE ON BOGADO/FILE-LINE (HOPEFULLY) WITHOUT THE WARTS
 " Maintainer: Martin Kopischke <martin@kopischke.net>
 " License:    MIT (see LICENSE.md)
-" Version:    2.0.0
+" Version:    2.0.1
 if &compatible || !has('autocmd') || v:version < 700
   finish
 endif