mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-06 03:18:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.0.1236: code in same_leader() can be simplified (#21968)

Browse Source 
Problem:    Code in same_leader() can be simplified.
Solution:   Simplify code that is executed only once. (closes vim/vim#11867)

9cbf791995
This commit is contained in:
zeertzjq
2023-01-24 07:40:22 +08:00
committed by GitHub
parent 322c83896d
commit dbb6c7f1b8
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/nvim/textformat.c
View File

@@ -530,9 +530,6 @@ static bool same_leader(linenr_T lnum, int leader1_len, char *leader1_flags, int
return leader2_len == 0; return leader2_len == 0;
} }
char *lnum_line = NULL;
int line_len = 0;
// If first leader has 'f' flag, the lines can be joined only if the // If first leader has 'f' flag, the lines can be joined only if the
// second line does not have a leader. // second line does not have a leader.
// If first leader has 'e' flag, the lines can never be joined. // If first leader has 'e' flag, the lines can never be joined.
@@ -547,10 +544,7 @@ static bool same_leader(linenr_T lnum, int leader1_len, char *leader1_flags, int
return false; return false;
} }
if (*p == COM_START) { if (*p == COM_START) {
if (lnum_line == NULL) { int line_len = (int)strlen(ml_get(lnum));
lnum_line = ml_get(lnum);
line_len = (int)strlen(lnum_line);
}
if (line_len <= leader1_len) { if (line_len <= leader1_len) {
return false; return false;
} }