From 2ed890f1f810f977ec6a235efd8bf58adddcd0e7 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 21 Jun 2018 20:31:14 +0200
Subject: [PATCH] patch 8.1.0093: non-MS-Windows: Cannot interrupt gdb when
program is running
Problem: non-MS-Windows: Cannot interrupt gdb when program is running.
Solution: Only use debugbreak() on MS-Windows.
---
.../pack/dist/opt/termdebug/plugin/termdebug.vim | 15 ++++++++++-----
src/version.c | 2 ++
2 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim b/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim
index d837acd8c..b6d9ac5b8 100644
--- a/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim
+++ b/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim
@@ -402,12 +402,17 @@ endfunc
" Function called when pressing CTRL-C in the prompt buffer and when placing a
" breakpoint.
func s:PromptInterrupt()
- if s:pid == 0
- echoerr 'Cannot interrupt gdb, did not find a process ID'
+ call ch_log('Interrupting gdb')
+ if has('win32')
+ " Using job_stop() does not work on MS-Windows, need to send SIGTRAP to
+ " the debugger program so that gdb responds again.
+ if s:pid == 0
+ echoerr 'Cannot interrupt gdb, did not find a process ID'
+ else
+ call debugbreak(s:pid)
+ endif
else
- call ch_log('Interrupting gdb')
- " Using job_stop(s:gdbjob, 'int') does not work.
- call debugbreak(s:pid)
+ call job_stop(s:gdbjob, 'int')
endif
endfunc
diff --git a/src/version.c b/src/version.c
index 80a3c2cbd..b821423ea 100644
--- a/src/version.c
+++ b/src/version.c
@@ -761,6 +761,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 93,
/**/
92,
/**/
--
2.40.0