Mercurial > vim

comparison src/normal.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 f2cf5698a93f
children e83c6c10320c
comparison
equal deleted inserted replaced
11992:e5c731391a9f 11993:92a86fe8adc0
4637 # endif 4637 # endif
4638 4638
4639 if (cap->arg == MSCR_UP || cap->arg == MSCR_DOWN) 4639 if (cap->arg == MSCR_UP || cap->arg == MSCR_DOWN)
4640 { 4640 {
4641 # ifdef FEAT_TERMINAL 4641 # ifdef FEAT_TERMINAL
4642 if (term_use_loop(FALSE)) 4642 if (term_use_loop())
4643 send_keys_to_term(curbuf->b_term, cap->cmdchar, TRUE); 4643 send_keys_to_term(curbuf->b_term, cap->cmdchar, TRUE);
4644 else 4644 else
4645 # endif 4645 # endif
4646 if (mod_mask & (MOD_MASK_SHIFT | MOD_MASK_CTRL)) 4646 if (mod_mask & (MOD_MASK_SHIFT | MOD_MASK_CTRL))
4647 { 4647 {
9059 #else 9059 #else
9060 clearopbeep(cap->oap); 9060 clearopbeep(cap->oap);
9061 #endif 9061 #endif
9062 } 9062 }
9063 #ifdef FEAT_TERMINAL 9063 #ifdef FEAT_TERMINAL
9064 else if (term_in_terminal_mode()) 9064 else if (term_in_normal_mode())
9065 { 9065 {
9066 clearop(cap->oap); 9066 clearop(cap->oap);
9067 term_leave_terminal_mode(); 9067 term_enter_job_mode();
9068 return; 9068 return;
9069 } 9069 }
9070 #endif 9070 #endif
9071 else if (!curbuf->b_p_ma && !p_im) 9071 else if (!curbuf->b_p_ma && !p_im)
9072 { 9072 {