fix: use normal! <C-L> in default <C-L> mapping (#17695)

gpanders · web-flow · commit f291a0339c18 · 2022-03-12T17:56:53.000-07:00
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
@@ -84,7 +84,7 @@ Nvim creates the following default mappings at |startup|. You can disable any
 of these in your config by simply removing the mapping, e.g. ":unmap Y".
 >
 	nnoremap Y y$
-	nnoremap <C-L> <Cmd>nohlsearch<Bar>diffupdate<CR><C-L>
+	nnoremap <C-L> <Cmd>nohlsearch<Bar>diffupdate<Bar>normal! <C-L><CR>
 	inoremap <C-U> <C-G>u<C-U>
 	inoremap <C-W> <C-G>u<C-W>
 <
diff --git a/src/nvim/getchar.c b/src/nvim/getchar.c
@@ -842,7 +842,10 @@ static void init_typebuf(void)
 void init_default_mappings(void)
 {
   add_map((char_u *)"Y y$", NORMAL, true);
-  add_map((char_u *)"<C-L> <Cmd>nohlsearch<Bar>diffupdate<CR><C-L>", NORMAL, true);
+
+  // Use normal! <C-L> to prevent inserting raw <C-L> when using i_<C-O>
+  // See https://github.com/neovim/neovim/issues/17473
+  add_map((char_u *)"<C-L> <Cmd>nohlsearch<Bar>diffupdate<Bar>normal! <C-L><CR>", NORMAL, true);
   add_map((char_u *)"<C-U> <C-G>u<C-U>", INSERT, true);
   add_map((char_u *)"<C-W> <C-G>u<C-W>", INSERT, true);
 }

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ Nvim creates the following default mappings at \|startup\|. You can disable any`
`84`	`84`	`of these in your config by simply removing the mapping, e.g. ":unmap Y".`
`85`	`85`	`>`
`86`	`86`	`nnoremap Y y$`
`87`		`- nnoremap <C-L> <Cmd>nohlsearch<Bar>diffupdate<CR><C-L>`
	`87`	`+ nnoremap <C-L> <Cmd>nohlsearch<Bar>diffupdate<Bar>normal! <C-L><CR>`
`88`	`88`	`inoremap <C-U> <C-G>u<C-U>`
`89`	`89`	`inoremap <C-W> <C-G>u<C-W>`
`90`	`90`	`<`
Original file line number	Diff line number	Diff line change
`@@ -842,7 +842,10 @@ static void init_typebuf(void)`
`842`	`842`	`void init_default_mappings(void)`
`843`	`843`	`{`
`844`	`844`	`add_map((char_u *)"Y y$", NORMAL, true);`
`845`		`- add_map((char_u *)"<C-L> <Cmd>nohlsearch<Bar>diffupdate<CR><C-L>", NORMAL, true);`
	`845`	`+`
	`846`	`+ // Use normal! <C-L> to prevent inserting raw <C-L> when using i_<C-O>`
	`847`	`+ // See https://github.com/neovim/neovim/issues/17473`
	`848`	`+ add_map((char_u *)"<C-L> <Cmd>nohlsearch<Bar>diffupdate<Bar>normal! <C-L><CR>", NORMAL, true);`
`846`	`849`	`add_map((char_u *)"<C-U> <C-G>u<C-U>", INSERT, true);`
`847`	`850`	`add_map((char_u *)"<C-W> <C-G>u<C-W>", INSERT, true);`
`848`	`851`	`}`