patch 8.1.0196: terminal debugger error with .gdbinit file

Problem:    Terminal debugger error with .gdbinit file.
Solution:   Check two lines for the "new ui" response. (hint from Hirohito
            Higashi)

diff --git a/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim b/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim
index 63a3b1d83d0097332d1163ac01d4e72af19b832a..ec55cf676a33d6942cf02b9f689f86b0d2054b86 100644 (file)
--- 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 997f4a034756ee12a9b9316ff7fad8753cdce386..83518a98e838e59ec2d51bf652c453c6b5a7da98 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -789,6 +789,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    196,
 /**/
     195,
 /**/