Skip to content

Commit

Permalink
update plugins
Browse files Browse the repository at this point in the history
  • Loading branch information
jceb committed Jan 24, 2015
1 parent 7216b65 commit cf61ac0
Show file tree
Hide file tree
Showing 10 changed files with 32 additions and 1,003 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -67,3 +67,6 @@
[submodule "bundle/lastplace"]
path = bundle/lastplace
url = git@github.com:dietsche/vim-lastplace.git
[submodule "ipi/speeddating"]
path = ipi/speeddating
url = git@github.com:tpope/vim-speeddating.git
3 changes: 1 addition & 2 deletions GetLatest/GetLatestVimScripts.dat
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ ScriptID SourceID Filename
1832 6891 bundle/asciidoc
1890 17529 ipi/lusty explorer
2100 17246 bundle/textobj-user
2120 12533 ipi/speeddating
2174 21988 bundle/repmo
2136 19285 bundle/repeat
2332 21650 autoload/pathogen.vim
Expand All @@ -22,7 +21,7 @@ ScriptID SourceID Filename
2930 21264 bundle/rfc
3059 12839 bundle/lastpos
3109 16732 bundle/LaTeX_Box
3130 21828 ipi/CountJump
3130 22719 ipi/CountJump
3223 21514 ipi/LanguageTool
3286 14310 bundle/LiteTabPage
3304 20505 ipi/gundo
Expand Down
31 changes: 17 additions & 14 deletions ipi/CountJump/autoload/CountJump.vim
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
" CountJump.vim: Move to a buffer position via repeated jumps (or searches).
"
" DEPENDENCIES:
" - ingo/msg.vim autoload script
" - ingo/pos.vim autoload script
" - ingo/motion/helper.vim autoload script (optional)
"
" Copyright: (C) 2009-2014 Ingo Karkat
Expand All @@ -9,6 +11,10 @@
" Maintainer: Ingo Karkat <ingo@karkat.de>
"
" REVISION DATE REMARKS
" 1.85.022 12-Jun-2014 Make test for 'virtualedit' option values also
" account for multiple values.
" 1.85.021 05-May-2014 Use ingo#msg#WarningMsg().
" 1.85.020 30-Apr-2014 Use ingo/pos.vim.
" 1.83.019 11-Jan-2014 Factor out special treatment for visual and
" operator-pending motions to
" ingo#motion#helper#AdditionalMovement(), but
Expand Down Expand Up @@ -96,10 +102,7 @@

function! s:WrapMessage( searchName, isBackward )
if &shortmess !~# 's'
let v:warningmsg = a:searchName . ' ' . (a:isBackward ? 'hit TOP, continuing at BOTTOM' : 'hit BOTTOM, continuing at TOP')
echohl WarningMsg
echomsg v:warningmsg
echohl None
call ingo#msg#WarningMsg(a:searchName . ' ' . (a:isBackward ? 'hit TOP, continuing at BOTTOM' : 'hit BOTTOM, continuing at TOP'))
endif
endfunction
function! CountJump#CountSearchWithWrapMessage( count, searchName, searchArguments )
Expand Down Expand Up @@ -159,9 +162,9 @@ function! CountJump#CountSearchWithWrapMessage( count, searchName, searchArgumen

" Note: No need to check s:searchArguments and 'wrapscan'; the wrapping
" can only occur if 'wrapscan' is actually on.
if ! l:isBackward && (l:prevLine > l:matchPosition[0] || l:prevLine == l:matchPosition[0] && l:prevCol >= l:matchPosition[1])
if ! l:isBackward && ingo#pos#IsOnOrAfter([l:prevLine, l:prevCol], l:matchPosition)
let l:isWrapped = 1
elseif l:isBackward && (l:prevLine < l:matchPosition[0] || l:prevLine == l:matchPosition[0] && l:prevCol <= l:matchPosition[1])
elseif l:isBackward && ingo#pos#IsOnOrBefore([l:prevLine, l:prevCol], l:matchPosition)
let l:isWrapped = 1
endif
let [l:prevLine, l:prevCol] = l:matchPosition
Expand Down Expand Up @@ -198,14 +201,14 @@ else
function! s:AdditionalMovement( isSpecialLastLineTreatment )
let l:save_ww = &whichwrap
set whichwrap+=l
if a:isSpecialLastLineTreatment && line('.') == line('$') && &virtualedit !=# 'onemore' && &virtualedit !=# 'all'
if l:isSpecialLastLineTreatment && line('.') == line('$') && &virtualedit !~# 'all\|onemore'
" For the last line in the buffer, that still doesn't work in
" operator-pending mode, unless we can do virtual editing.
let l:save_ve = &virtualedit
let l:save_virtualedit = &virtualedit
set virtualedit=onemore
normal! l
augroup IngoLibraryTempVirtualEdit
execute 'autocmd! CursorMoved * set virtualedit=' . l:save_ve . ' | autocmd! IngoLibraryTempVirtualEdit'
execute 'autocmd! CursorMoved * set virtualedit=' . l:save_virtualedit . ' | autocmd! IngoLibraryTempVirtualEdit'
augroup END
else
normal! l
Expand Down Expand Up @@ -326,14 +329,14 @@ function! CountJump#JumpFunc( mode, JumpFunc, ... )
" line.
let l:save_ww = &whichwrap
set whichwrap+=l
if a:mode ==# 'O' && line('.') == line('$') && &virtualedit !=# 'onemore' && &virtualedit !=# 'all'
if a:mode ==# 'O' && line('.') == line('$') && ! ingo#option#ContainsOneOf(&virtualedit, ['all', 'onemore'])
" For the last line in the buffer, that still doesn't work,
" unless we can do virtual editing.
let l:save_ve = &virtualedit
let l:save_virtualedit = &virtualedit
set virtualedit=onemore
normal! l
augroup TempVirtualEdit
execute 'autocmd! CursorMoved * set virtualedit=' . l:save_ve . ' | autocmd! TempVirtualEdit'
execute 'autocmd! CursorMoved * set virtualedit=' . l:save_virtualedit . ' | autocmd! TempVirtualEdit'
augroup END
else
normal! l
Expand Down Expand Up @@ -394,9 +397,9 @@ function! CountJump#CountJumpFuncWithWrapMessage( count, searchName, isBackward,
return l:matchPosition
endif

if ! a:isBackward && (l:prevLine > l:matchPosition[0] || l:prevLine == l:matchPosition[0] && l:prevCol >= l:matchPosition[1])
if ! a:isBackward && ingo#pos#IsOnOrAfter([l:prevLine, l:prevCol], l:matchPosition)
let l:isWrapped = 1
elseif a:isBackward && (l:prevLine < l:matchPosition[0] || l:prevLine == l:matchPosition[0] && l:prevCol <= l:matchPosition[1])
elseif a:isBackward && ingo#pos#IsOnOrBefore([l:prevLine, l:prevCol], l:matchPosition)
let l:isWrapped = 1
endif
let [l:prevLine, l:prevCol] = l:matchPosition
Expand Down
5 changes: 3 additions & 2 deletions ipi/CountJump/autoload/CountJump/TextObject.vim
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,15 @@
"
" DEPENDENCIES:
" - CountJump.vim, CountJump/Mappings.vim autoload scripts
" - ingo/pos.vim autoload script
"
" Copyright: (C) 2009-2014 Ingo Karkat
" The VIM LICENSE applies to this script; see ':help copyright'.
"
" Maintainer: Ingo Karkat <ingo@karkat.de>
"
" REVISION DATE REMARKS
" 1.85.020 30-Apr-2014 Use ingo/pos.vim.
" 1.84.017 24-Apr-2014 FIX: There are no buffer-local functions with a
" b: scope prefix, and Vim 7.4.264 disallows those
" invalid function names now. Previously, multiple
Expand Down Expand Up @@ -233,8 +235,7 @@ function! CountJump#TextObject#TextObjectWithJumpFunctions( mode, isInner, isExc
"****D echomsg '**** text object from' string(l:beginPosition) 'to' string(l:endPosition)
" When the end position is before the begin position, that's not
" a valid selection.
if l:endPosition[1] < l:beginPosition[1] ||
\ l:endPosition[1] == l:beginPosition[1] && l:endPosition[2] < l:beginPosition[2]
if ingo#pos#IsBefore(l:endPosition[1:2], l:beginPosition[1:2])
execute "normal! \<C-\>\<C-n>\<Esc>"

call winrestview(l:save_view)
Expand Down
8 changes: 7 additions & 1 deletion ipi/CountJump/doc/CountJump.txt
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ To uninstall, use the |:RmVimball| command.
DEPENDENCIES *CountJump-dependencies*

- Requires Vim 7.0 or higher.
- |ingo-library.vim| plugin (vimscript #4433), version 1.016 or higher
- |ingo-library.vim| plugin (vimscript #4433), version 1.019 or higher
(optional).

==============================================================================
Expand Down Expand Up @@ -254,6 +254,12 @@ IDEAS *CountJump-ideas*
==============================================================================
HISTORY *CountJump-history*

1.85 23-Dec-2014
- Use ingo/pos.vim.
- Use ingo#msg#WarningMsg().
- Make test for 'virtualedit' option values also account for multiple values.
*** You need to update to ingo-library (vimscript #4433) version 1.019! ***

1.84 25-Apr-2014
- Pin down the 'virtualedit' setting (to "onemore") during
CountJump#TextObject#TextObjectWithJumpFunctions() to avoid that a
Expand Down
1 change: 1 addition & 0 deletions ipi/speeddating
Submodule speeddating added at 426c79
36 changes: 0 additions & 36 deletions ipi/speeddating/after/plugin/speeddating.vim

This file was deleted.

101 changes: 0 additions & 101 deletions ipi/speeddating/doc/speeddating.txt

This file was deleted.

14 changes: 0 additions & 14 deletions ipi/speeddating/doc/tags

This file was deleted.

Loading

0 comments on commit cf61ac0

Please sign in to comment.