Mercurial > vim

comparison src/main.c @ 14129:cb731d098241 v8.1.0082

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.1.0082: in terminal window, typing : at more prompt, inserts ':' commit https://github.com/vim/vim/commit/1d4754f96fa5bff1c349cdb71560c55675f50d03 Author: Bram Moolenaar <Bram@vim.org> Date: Tue Jun 19 17:49:24 2018 +0200 patch 8.1.0082: in terminal window, typing : at more prompt, inserts ':' Problem: In terminal window, typing : at more prompt, inserts ':' instead of starting another Ex command. Solution: Add skip_term_loop and set it when putting ':' in the typeahead buffer.
author Christian Brabandt <cb@256bit.org>
date Tue, 19 Jun 2018 18:00:07 +0200
parents 032bc07c32da
children 01b7a627d403
comparison
equal deleted inserted replaced
14128:09afa19020db 14129:cb731d098241
1337 else 1337 else
1338 { 1338 {
1339 #ifdef FEAT_TERMINAL 1339 #ifdef FEAT_TERMINAL
1340 if (term_use_loop() 1340 if (term_use_loop()
1341 && oa.op_type == OP_NOP && oa.regname == NUL 1341 && oa.op_type == OP_NOP && oa.regname == NUL
1342 && !VIsual_active) 1342 && !VIsual_active
1343 && !skip_term_loop)
1343 { 1344 {
1344 /* If terminal_loop() returns OK we got a key that is handled 1345 /* If terminal_loop() returns OK we got a key that is handled
1345 * in Normal model. With FAIL we first need to position the 1346 * in Normal model. With FAIL we first need to position the
1346 * cursor and the screen needs to be redrawn. */ 1347 * cursor and the screen needs to be redrawn. */
1347 if (terminal_loop(TRUE) == OK) 1348 if (terminal_loop(TRUE) == OK)
1348 normal_cmd(&oa, TRUE); 1349 normal_cmd(&oa, TRUE);
1349 } 1350 }
1350 else 1351 else
1351 #endif 1352 #endif
1353 {
1354 #ifdef FEAT_TERMINAL
1355 skip_term_loop = FALSE;
1356 #endif
1352 normal_cmd(&oa, TRUE); 1357 normal_cmd(&oa, TRUE);
1358 }
1353 } 1359 }
1354 } 1360 }
1355 } 1361 }
1356 1362
1357 1363
3318 #ifdef AMIGA 3324 #ifdef AMIGA
3319 main_msg(_("-f\t\t\tDon't use newcli to open window")); 3325 main_msg(_("-f\t\t\tDon't use newcli to open window"));
3320 main_msg(_("-dev <device>\t\tUse <device> for I/O")); 3326 main_msg(_("-dev <device>\t\tUse <device> for I/O"));
3321 #endif 3327 #endif
3322 #ifdef FEAT_ARABIC 3328 #ifdef FEAT_ARABIC
3323 main_msg(_("-A\t\t\tstart in Arabic mode")); 3329 main_msg(_("-A\t\t\tStart in Arabic mode"));
3324 #endif 3330 #endif
3325 #ifdef FEAT_RIGHTLEFT 3331 #ifdef FEAT_RIGHTLEFT
3326 main_msg(_("-H\t\t\tStart in Hebrew mode")); 3332 main_msg(_("-H\t\t\tStart in Hebrew mode"));
3327 #endif 3333 #endif
3328 #ifdef FEAT_FKMAP 3334 #ifdef FEAT_FKMAP