summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2018-07-19 02:55:01 +0200
committerBram Moolenaar <Bram@vim.org>2018-07-19 02:55:01 +0200
commit963c1ad5d072346d9e95d4c3be066b5e03c601d3 (patch)
tree96073f0b8e9c9fc4405e2720d68b87490d7bc215
parent414998023fbff15cce20ef01a54d0366370ad8b6 (diff)
downloadvim-git-963c1ad5d072346d9e95d4c3be066b5e03c601d3.tar.gz
patch 8.1.0195: terminal debugger commands don't always workv8.1.0195
Problem: Terminal debugger commands don't always work. (Dominique Pelle) Solution: Set 'cpo' to its default value when defining commands. (Christian Brabandt)
-rw-r--r--runtime/pack/dist/opt/termdebug/plugin/termdebug.vim5
-rw-r--r--src/version.c2
2 files changed, 7 insertions, 0 deletions
diff --git a/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim b/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim
index 4ccbc4cb6..63a3b1d83 100644
--- a/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim
+++ b/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim
@@ -566,6 +566,9 @@ endfunc
" Install commands in the current window to control the debugger.
func s:InstallCommands()
+ let save_cpo = &cpo
+ set cpo&vim
+
command Break call s:SetBreakpoint()
command Clear call s:ClearBreakpoint()
command Step call s:SendCommand('-exec-step')
@@ -603,6 +606,8 @@ func s:InstallCommands()
an 1.230 PopUp.Evaluate :Evaluate<CR>
endif
endif
+
+ let &cpo = save_cpo
endfunc
let s:winbar_winids = []
diff --git a/src/version.c b/src/version.c
index f6542b672..997f4a034 100644
--- a/src/version.c
+++ b/src/version.c
@@ -790,6 +790,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 195,
+/**/
194,
/**/
193,