aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzeertzjq <zeertzjq@outlook.com>2023-01-24 07:40:22 +0800
committerGitHub <noreply@github.com>2023-01-24 07:40:22 +0800
commitdbb6c7f1b8bed789f5bebb73be332c063fc6a604 (patch)
tree0ee7b6df89d32e5ca946a75468627217f4e38a36
parent322c83896d6fe6ccc4f799f282d8e1feb7cf7ebe (diff)
downloadrneovim-dbb6c7f1b8bed789f5bebb73be332c063fc6a604.tar.gz
rneovim-dbb6c7f1b8bed789f5bebb73be332c063fc6a604.tar.bz2
rneovim-dbb6c7f1b8bed789f5bebb73be332c063fc6a604.zip
vim-patch:9.0.1236: code in same_leader() can be simplified (#21968)
Problem: Code in same_leader() can be simplified. Solution: Simplify code that is executed only once. (closes vim/vim#11867) https://github.com/vim/vim/commit/9cbf791995514e72476399fe06e055a707ec0158
-rw-r--r--src/nvim/textformat.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/nvim/textformat.c b/src/nvim/textformat.c
index fcf5a32f09..fbea1ccfb7 100644
--- a/src/nvim/textformat.c
+++ b/src/nvim/textformat.c
@@ -530,9 +530,6 @@ static bool same_leader(linenr_T lnum, int leader1_len, char *leader1_flags, int
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
// second line does not have a leader.
// 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;
}
if (*p == COM_START) {
- if (lnum_line == NULL) {
- lnum_line = ml_get(lnum);
- line_len = (int)strlen(lnum_line);
- }
+ int line_len = (int)strlen(ml_get(lnum));
if (line_len <= leader1_len) {
return false;
}