From 3e2afbccdf6b48cd0048d595b676e8d83c5ea518 Mon Sep 17 00:00:00 2001 From: "Mr.Agony" Date: Tue, 24 Dec 2024 05:28:24 +0000 Subject: [PATCH] =?UTF-8?q?update=20src/textformat.c.=20=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=A3=80=E6=9F=A5=20lnum=5Fline=20=E6=98=AF=E5=90=A6=E4=B8=BA?= =?UTF-8?q?=20NULL=E3=80=82=20=E5=A6=82=E6=9E=9C=20lnum=5Fline=20=E6=98=AF?= =?UTF-8?q?=20NULL=EF=BC=8C=E8=AF=B4=E6=98=8E=E5=BD=93=E5=89=8D=E8=A1=8C?= =?UTF-8?q?=E8=BF=98=E6=B2=A1=E6=9C=89=E8=A2=AB=E8=AF=BB=E5=8F=96=E6=88=96?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E8=BF=87=EF=BC=8C=E5=9B=A0=E6=AD=A4?= =?UTF-8?q?=E9=9C=80=E8=A6=81=E9=80=9A=E8=BF=87=20ml=5Fget(lnum)=20?= =?UTF-8?q?=E6=9D=A5=E8=8E=B7=E5=8F=96=E5=BD=93=E5=89=8D=E8=A1=8C=E7=9A=84?= =?UTF-8?q?=E5=86=85=E5=AE=B9=EF=BC=8C=E5=B9=B6=E5=B0=86=E5=85=B6=E5=AD=98?= =?UTF-8?q?=E5=82=A8=E5=88=B0=20lnum=5Fline=20=E4=B8=AD=20=E5=8D=B3?= =?UTF-8?q?=E5=8F=AA=E6=9C=89=E5=BD=93=20lnum=5Fline=20=E4=B8=BA=E7=A9=BA?= =?UTF-8?q?=E6=97=B6=E6=89=8D=E5=8E=BB=E5=8A=A0=E8=BD=BD=E5=BD=93=E5=89=8D?= =?UTF-8?q?=E8=A1=8C=E5=86=85=E5=AE=B9=EF=BC=8C=E5=B9=B6=E8=AE=A1=E7=AE=97?= =?UTF-8?q?=E8=AF=A5=E8=A1=8C=E7=9A=84=E9=95=BF=E5=BA=A6=E3=80=82=20?= =?UTF-8?q?=E5=A6=82=E6=9E=9C=E5=BD=93=E5=89=8D=E8=A1=8C=E7=9A=84=E9=95=BF?= =?UTF-8?q?=E5=BA=A6=E5=B0=8F=E4=BA=8E=E7=AD=89=E4=BA=8E=20leader1=5Flen?= =?UTF-8?q?=EF=BC=8C=E5=88=99=E8=BF=94=E5=9B=9E=20FALSE=EF=BC=8C=E5=8F=AF?= =?UTF-8?q?=E8=83=BD=E6=98=AF=E4=B8=BA=E4=BA=86=E9=AA=8C=E8=AF=81=E5=BD=93?= =?UTF-8?q?=E5=89=8D=E8=A1=8C=E6=98=AF=E5=90=A6=E7=AC=A6=E5=90=88=E7=89=B9?= =?UTF-8?q?=E5=AE=9A=E7=9A=84=E8=A6=81=E6=B1=82=E3=80=82=E5=A6=82=E6=9E=9C?= =?UTF-8?q?=E9=95=BF=E5=BA=A6=E4=B8=8D=E8=B6=B3=EF=BC=8C=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=20FALSE=20=E5=8F=AF=E8=83=BD=E6=98=AF=E4=B8=BA=E4=BA=86?= =?UTF-8?q?=E4=BF=9D=E8=AF=81=E5=90=8E=E7=BB=AD=E6=93=8D=E4=BD=9C=E4=B8=8D?= =?UTF-8?q?=E4=BC=9A=E8=AE=BF=E9=97=AE=E4=B8=8D=E5=AE=8C=E6=95=B4=E6=88=96?= =?UTF-8?q?=E4=B8=8D=E7=AC=A6=E5=90=88=E6=9D=A1=E4=BB=B6=E7=9A=84=E8=A1=8C?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mr.Agony --- src/textformat.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/textformat.c b/src/textformat.c index a1a3e16..31e5380 100644 --- a/src/textformat.c +++ b/src/textformat.c @@ -539,6 +539,9 @@ same_leader( if (leader1_len == 0) return (leader2_len == 0); + + char_u *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. @@ -555,7 +558,11 @@ same_leader( return FALSE; if (*p == COM_START) { - int line_len = (int)STRLEN(ml_get(lnum)); + if (lnum_line == NULL) + { + lnum_line = ml_get(lnum); + line_len = (int)STRLEN(lnum_line); + } if (line_len <= leader1_len) return FALSE; if (leader2_flags == NULL || leader2_len == 0) -- Gitee