mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-28 14:08:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:partial:9.0.1166: code is indented more than necessary (#21716)

Browse Source 
Problem:    Code is indented more than necessary.
Solution:   Use an early return where it makes sense. (Yegappan Lakshmanan,
            closes vim/vim#11792)

1cfb14aa97

Partial port as some highlight.c changes depend on previous patches.
Cherry-pick fname_match() change from patch 8.2.4959.
Omit internal_func_check_arg_types(): only used for Vim9 script.

N/A patches for version.c:

vim-patch:9.0.1167: EditorConfig files do not have their own filetype

Problem:    EditorConfig files do not have their own filetype.
Solution:   Add the "editorconfig" filetype. (Gregory Anders, closes vim/vim#11779)

d41262ed06

Co-authored-by: Yegappan Lakshmanan <yegappan@yahoo.com>
This commit is contained in:
zeertzjq
2023-01-10 08:46:42 +08:00
committed by GitHub
parent 364b131f42
commit dc7edce650
12 changed files with 300 additions and 267 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/nvim/digraph.c
View File

@@ -1528,30 +1528,31 @@ int get_digraph(bool cmdline)
no_mapping--;
allow_keys--;
if (c != ESC) {
if (c == ESC) { // ESC cancels CTRL-K
return NUL;
}
if (IS_SPECIAL(c)) {
// insert special key code
return c;
}
if (cmdline) {
if ((char2cells(c) == 1) && c < 128 && (cmdline_star == 0)) {
putcmdline((char)c, true);
}
} else {
add_to_showcmd(c);
}
no_mapping++;
allow_keys++;
int cc = plain_vgetc();
no_mapping--;
allow_keys--;
if (cc != ESC) {
// ESC cancels CTRL-K
if (IS_SPECIAL(c)) {
// insert special key code
return c;
}
if (cmdline) {
if ((char2cells(c) == 1) && c < 128 && (cmdline_star == 0)) {
putcmdline((char)c, true);
}
} else {
add_to_showcmd(c);
}
no_mapping++;
allow_keys++;
int cc = plain_vgetc();
no_mapping--;
allow_keys--;
if (cc != ESC) {
// ESC cancels CTRL-K
return digraph_get(c, cc, true);
}
return digraph_get(c, cc, true);
}
return NUL;
}