summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2018-04-13 22:11:56 +0200
committerBram Moolenaar <Bram@vim.org>2018-04-13 22:11:56 +0200
commitb59118d5012a6a07e2d54504fbb04837b5a1208c (patch)
tree5f56e5bc969a7d58305a5a50a453bea4a24820cf
parent5bab555c2f1b3b86d57e4adeb86d908eff477fc9 (diff)
patch 8.0.1706: cannot sent CTRL-\ to a terminal windowv8.0.1706
Problem: Cannot sent CTRL-\ to a terminal window. Solution: Make CTRL-W CTRL-\ send CTRL-\ to a terminal window.
-rw-r--r--runtime/doc/terminal.txt1
-rw-r--r--src/terminal.c7
-rw-r--r--src/version.c2
3 files changed, 9 insertions, 1 deletions
diff --git a/runtime/doc/terminal.txt b/runtime/doc/terminal.txt
index 551a3740c2..63217c2fa0 100644
--- a/runtime/doc/terminal.txt
+++ b/runtime/doc/terminal.txt
@@ -72,6 +72,7 @@ See |CTRL-W| for more commands.
Special in the terminal window: *CTRL-W_.* *CTRL-W_N*
CTRL-W . send a CTRL-W to the job in the terminal
+ CTRL-W CTRL-\ send a CTRL-\ to the job in the terminal
CTRL-W N go to Terminal-Normal mode, see |Terminal-mode|
CTRL-\ CTRL-N go to Terminal-Normal mode, see |Terminal-mode|
CTRL-W " {reg} paste register {reg} *CTRL-W_quote*
diff --git a/src/terminal.c b/src/terminal.c
index 9a62edd67b..f980a09929 100644
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -2056,6 +2056,11 @@ terminal_loop(int blocking)
/* "CTRL-W .": send CTRL-W to the job */
c = Ctrl_W;
}
+ else if (termkey == 0 && c == Ctrl_BSL)
+ {
+ /* "CTRL-W CTRL-\": send CTRL-\ to the job */
+ c = Ctrl_BSL;
+ }
else if (c == 'N')
{
/* CTRL-W N : go to Terminal-Normal mode. */
@@ -2173,7 +2178,7 @@ color2index(VTermColor *color, int fg, int *boldp)
case 2: return lookup_color( 4, fg, boldp) + 1; /* dark red */
case 3: return lookup_color( 2, fg, boldp) + 1; /* dark green */
case 4: return lookup_color( 6, fg, boldp) + 1; /* brown */
- case 5: return lookup_color( 1, fg, boldp) + 1; /* dark blue*/
+ case 5: return lookup_color( 1, fg, boldp) + 1; /* dark blue */
case 6: return lookup_color( 5, fg, boldp) + 1; /* dark magenta */
case 7: return lookup_color( 3, fg, boldp) + 1; /* dark cyan */
case 8: return lookup_color( 8, fg, boldp) + 1; /* light grey */
diff --git a/src/version.c b/src/version.c
index 6c3b38ddb9..4cba818494 100644
--- a/src/version.c
+++ b/src/version.c
@@ -763,6 +763,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1706,
+/**/
1705,
/**/
1704,