diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-01-24 15:57:55 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-01-24 15:57:55 +0100 |
| commit | abbc448bc09a292ec1263ffe69b4cb3d1c57f020 (patch) | |
| tree | ad55a98606f5133be379acb14f859d9e5e22c9c8 | |
| parent | 2aa5f696b91a51f29873e340de4bdc182e1e8dd4 (diff) | |
patch 8.0.0228: pasting in xterm on the command line has PasteStartv8.0.0228
Problem: When pasting test in an xterm on the command line it is surrounded
by <PasteStart> and <PasteEnd>. (Johannes Kaltenbach)
Solution: Add missing changes.
| -rw-r--r-- | src/ex_getln.c | 13 | ||||
| -rw-r--r-- | src/term.c | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 15 insertions, 4 deletions
diff --git a/src/ex_getln.c b/src/ex_getln.c index 581c44492c..7de7246b55 100644 --- a/src/ex_getln.c +++ b/src/ex_getln.c @@ -1794,6 +1794,10 @@ getcmdline( goto cmdline_not_changed; #endif + case K_PS: + bracketed_paste(PASTE_CMDLINE, FALSE, NULL); + goto cmdline_changed; + default: #ifdef UNIX if (c == intr_char) @@ -2366,8 +2370,7 @@ getexmodeline( if (ga_grow(&line_ga, 40) == FAIL) break; - /* Get one character at a time. Don't use inchar(), it can't handle - * special characters. */ + /* Get one character at a time. */ prev_char = c1; c1 = vgetc(); @@ -2382,6 +2385,12 @@ getexmodeline( break; } + if (c1 == K_PS) + { + bracketed_paste(PASTE_EX, FALSE, &line_ga); + goto redraw; + } + if (!escaped) { /* CR typed means "enter", which is NL */ diff --git a/src/term.c b/src/term.c index 8cb92dc478..f65a15be72 100644 --- a/src/term.c +++ b/src/term.c @@ -3148,7 +3148,7 @@ starttermcap(void) { out_str(T_TI); /* start termcap mode */ out_str(T_KS); /* start "keypad transmit" mode */ - out_str(T_BE); /* enable bracketed paste moe */ + out_str(T_BE); /* enable bracketed paste mode */ out_flush(); termcap_active = TRUE; screen_start(); /* don't know where cursor is now */ @@ -3198,7 +3198,7 @@ stoptermcap(void) check_for_codes_from_term(); } #endif - out_str(T_BD); /* disable bracketed paste moe */ + out_str(T_BD); /* disable bracketed paste mode */ out_str(T_KE); /* stop "keypad transmit" mode */ out_flush(); termcap_active = FALSE; diff --git a/src/version.c b/src/version.c index 84dde7353e..6d3b8483f7 100644 --- a/src/version.c +++ b/src/version.c @@ -765,6 +765,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 228, +/**/ 227, /**/ 226, |