Mercurial > vim

diff 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
line wrap: on
line diff
--- a/src/normal.c
+++ b/src/normal.c
@@ -4639,7 +4639,7 @@ nv_mousescroll(cmdarg_T *cap)
     if (cap->arg == MSCR_UP || cap->arg == MSCR_DOWN)
     {
 # ifdef FEAT_TERMINAL
-	if (term_use_loop(FALSE))
+	if (term_use_loop())
 	    send_keys_to_term(curbuf->b_term, cap->cmdchar, TRUE);
 	else
 # endif
@@ -9061,10 +9061,10 @@ nv_edit(cmdarg_T *cap)
 #endif
     }
 #ifdef FEAT_TERMINAL
-    else if (term_in_terminal_mode())
+    else if (term_in_normal_mode())
     {
 	clearop(cap->oap);
-	term_leave_terminal_mode();
+	term_enter_job_mode();
 	return;
     }
 #endif