summaryrefslogtreecommitdiffstats
path: root/runtime/pack/dist
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-09-19 22:06:03 +0200
committerBram Moolenaar <Bram@vim.org>2017-09-19 22:06:03 +0200
commit37c64c78fd87e086b5a945ad7032787c274e2dcb (patch)
tree01639bc116fb3c7300537c097ab007abf1521ff0 /runtime/pack/dist
parente22bbf65088a01b465918919782c19eb291f9cf0 (diff)
Update runtime files.
Diffstat (limited to 'runtime/pack/dist')
-rw-r--r--runtime/pack/dist/opt/matchit/plugin/matchit.vim8
-rw-r--r--runtime/pack/dist/opt/termdebug/plugin/termdebug.vim5
2 files changed, 8 insertions, 5 deletions
diff --git a/runtime/pack/dist/opt/matchit/plugin/matchit.vim b/runtime/pack/dist/opt/matchit/plugin/matchit.vim
index 4c9b84592c..5e9df89c47 100644
--- a/runtime/pack/dist/opt/matchit/plugin/matchit.vim
+++ b/runtime/pack/dist/opt/matchit/plugin/matchit.vim
@@ -1,5 +1,5 @@
" matchit.vim: (global plugin) Extended "%" matching
-" Last Change: 2017 March 26
+" Last Change: 2017 Sep 15
" Maintainer: Benji Fisher PhD <benji@member.AMS.org>
" Version: 1.13.3, for Vim 6.3+
" Fix from Fernando Torres included.
@@ -704,9 +704,8 @@ fun! s:MultiMatch(spflag, mode)
let skip = 's:comment\|string'
endif
let skip = s:ParseSkip(skip)
- " let restore_cursor = line(".") . "G" . virtcol(".") . "|"
- " normal! H
- " let restore_cursor = "normal!" . line(".") . "Gzt" . restore_cursor
+ " save v:count1 variable, might be reset from the restore_cursor command
+ let level = v:count1
let restore_cursor = virtcol(".") . "|"
normal! g0
let restore_cursor = line(".") . "G" . virtcol(".") . "|zs" . restore_cursor
@@ -726,7 +725,6 @@ fun! s:MultiMatch(spflag, mode)
execute "if " . skip . "| let skip = '0' | endif"
endif
mark '
- let level = v:count1
while level
if searchpair(openpat, '', closepat, a:spflag, skip) < 1
call s:CleanUp(restore_options, a:mode, startline, startcol)
diff --git a/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim b/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim
index d23a883e7f..ba00f0114b 100644
--- a/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim
+++ b/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim
@@ -15,6 +15,11 @@
" Author: Bram Moolenaar
" Copyright: Vim license applies, see ":help license"
+" In case this gets loaded twice.
+if exists(':Termdebug')
+ finish
+endif
+
" The command that starts debugging, e.g. ":Termdebug vim".
" To end type "quit" in the gdb window.
command -nargs=* -complete=file Termdebug call s:StartDebug(<q-args>)