summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2018-07-19 04:13:36 +0200
committerBram Moolenaar <Bram@vim.org>2018-07-19 04:13:36 +0200
commitf63db65b2418140d1bdbc032511f530234bd2496 (patch)
tree50bd2af88c3b808247a6ff268eeae4521b62e80e
parent963c1ad5d072346d9e95d4c3be066b5e03c601d3 (diff)
patch 8.1.0196: terminal debugger error with .gdbinit filev8.1.0196
Problem: Terminal debugger error with .gdbinit file. Solution: Check two lines for the "new ui" response. (hint from Hirohito Higashi)
-rw-r--r--runtime/pack/dist/opt/termdebug/plugin/termdebug.vim3
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim b/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim
index 63a3b1d83d..ec55cf676a 100644
--- a/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim
+++ b/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim
@@ -200,7 +200,8 @@ func s:StartDebug_term(dict)
let response = ''
for lnum in range(1,200)
if term_getline(s:gdbbuf, lnum) =~ 'new-ui mi '
- let response = term_getline(s:gdbbuf, lnum + 1)
+ " response can be in the same line or the next line
+ let response = term_getline(s:gdbbuf, lnum) . term_getline(s:gdbbuf, lnum + 1)
if response =~ 'Undefined command'
echoerr 'Sorry, your gdb is too old, gdb 7.12 is required'
exe 'bwipe! ' . s:ptybuf
diff --git a/src/version.c b/src/version.c
index 997f4a0347..83518a98e8 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 */
/**/
+ 196,
+/**/
195,
/**/
194,