diff options
| -rw-r--r-- | src/errors.h | 2 | ||||
| -rw-r--r-- | src/terminal.c | 7 | ||||
| -rw-r--r-- | src/testdir/dumps/Test_cmdwin_no_terminal.dump | 12 | ||||
| -rw-r--r-- | src/testdir/test_cmdline.vim | 14 | ||||
| -rw-r--r-- | src/version.c | 2 |
5 files changed, 37 insertions, 0 deletions
diff --git a/src/errors.h b/src/errors.h index d6e5dd1d2..00d395bae 100644 --- a/src/errors.h +++ b/src/errors.h @@ -415,3 +415,5 @@ EXTERN char e_expression_does_not_result_in_value_str[] INIT(= N_("E1186: Expression does not result in a value: %s")); EXTERN char e_failed_to_source_defaults[] INIT(= N_("E1187: Failed to source defaults.vim")); +EXTERN char e_cannot_open_terminal_from_command_line_window[] + INIT(= N_("E1188: Cannot open a terminal from the command line window")); diff --git a/src/terminal.c b/src/terminal.c index 9ff498f73..2189d0184 100644 --- a/src/terminal.c +++ b/src/terminal.c @@ -445,6 +445,13 @@ term_start( if (check_restricted() || check_secure()) return NULL; +#ifdef FEAT_CMDWIN + if (cmdwin_type != 0) + { + emsg(_(e_cannot_open_terminal_from_command_line_window)); + return NULL; + } +#endif if ((opt->jo_set & (JO_IN_IO + JO_OUT_IO + JO_ERR_IO)) == (JO_IN_IO + JO_OUT_IO + JO_ERR_IO) diff --git a/src/testdir/dumps/Test_cmdwin_no_terminal.dump b/src/testdir/dumps/Test_cmdwin_no_terminal.dump new file mode 100644 index 000000000..97d81478e --- /dev/null +++ b/src/testdir/dumps/Test_cmdwin_no_terminal.dump @@ -0,0 +1,12 @@ +| +0&#ffffff0@74 +|[+1&&|N|o| |N|a|m|e|]| @47|0|,|0|-|1| @9|A|l@1 +|:+0#4040ff13&|s+0#af5f00255&|e|t| +0#0000000&|c+0#e000e06&|m|d|h|e|i|g|h|t|=+0#0000000&|2| @58 +|:+0#4040ff13&> +0#0000000&@73 +|~+0#4040ff13&| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|[+3#0000000&|C|o|m@1|a|n|d| |L|i|n|e|]| @42|2|,|0|-|1| @9|A|l@1 +|E+0#ffffff16#e000002|1@1|8@1|:| |C|a|n@1|o|t| |o|p|e|n| |a| |t|e|r|m|i|n|a|l| |f|r|o|m| |t|h|e| |c|o|m@1|a|n|d| |l|i|n|e| |w|i|n|d|o|w| +0#0000000#ffffff0@16 +@75 diff --git a/src/testdir/test_cmdline.vim b/src/testdir/test_cmdline.vim index c3a638ba1..8b7015b53 100644 --- a/src/testdir/test_cmdline.vim +++ b/src/testdir/test_cmdline.vim @@ -1192,6 +1192,20 @@ func Test_cmdwin_restore() call delete('XTest_restore') endfunc +func Test_cmdwin_no_terminal() + CheckFeature cmdwin + CheckFeature terminal + + let buf = RunVimInTerminal('', {'rows': 12}) + call TermWait(buf, 50) + call term_sendkeys(buf, ":set cmdheight=2\<CR>") + call term_sendkeys(buf, "q:") + call term_sendkeys(buf, ":let buf = term_start(['/bin/echo'], #{hidden: 1})\<CR>") + call VerifyScreenDump(buf, 'Test_cmdwin_no_terminal', {}) + call term_sendkeys(buf, ":q\<CR>") + call StopVimInTerminal(buf) +endfunc + func Test_buffers_lastused() " check that buffers are sorted by time when wildmode has lastused call test_settime(1550020000) " middle diff --git a/src/version.c b/src/version.c index 36979c89c..4b145f199 100644 --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2908, +/**/ 2907, /**/ 2906, |