Mercurial > vim

comparison src/main.c @ 11993:92a86fe8adc0 v8.0.0877

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.0.0877: using CTRL- CTRL-N in terminal is inconsistent commit https://github.com/vim/vim/commit/6d8197485dc84532e37aced2c39292bff374200d Author: Bram Moolenaar <Bram@vim.org> Date: Sun Aug 6 14:57:49 2017 +0200 patch 8.0.0877: using CTRL-\ CTRL-N in terminal is inconsistent Problem: Using CTRL-\ CTRL-N in terminal is inconsistent. Solution: Stay in Normal mode.
author Christian Brabandt <cb@256bit.org>
date Sun, 06 Aug 2017 15:00:04 +0200
parents d036c1c8537d
children 9e5f310b0713
comparison
equal deleted inserted replaced
11992:e5c731391a9f 11993:92a86fe8adc0
1354 do_exmode(exmode_active == EXMODE_VIM); 1354 do_exmode(exmode_active == EXMODE_VIM);
1355 } 1355 }
1356 else 1356 else
1357 { 1357 {
1358 #ifdef FEAT_TERMINAL 1358 #ifdef FEAT_TERMINAL
1359 if (term_use_loop(TRUE) 1359 if (term_use_loop()
1360 && oa.op_type == OP_NOP && oa.regname == NUL 1360 && oa.op_type == OP_NOP && oa.regname == NUL
1361 && !VIsual_active) 1361 && !VIsual_active)
1362 { 1362 {
1363 /* If terminal_loop() returns OK we got a key that is handled 1363 /* If terminal_loop() returns OK we got a key that is handled
1364 * in Normal model. With FAIL the terminal was closed and the 1364 * in Normal model. With FAIL we first need to position the
1365 * screen needs to be redrawn. */ 1365 * cursor and the screen needs to be redrawn. */
1366 if (terminal_loop() == OK) 1366 if (terminal_loop() == OK)
1367 normal_cmd(&oa, TRUE); 1367 normal_cmd(&oa, TRUE);
1368 } 1368 }
1369 else 1369 else
1370 #endif 1370 #endif