patch 8.2.5070: unnecessary code

Problem:    Unnecessary code.
Solution:   Remove code that isn't needed. (closes #10534)

diff --git a/src/message.c b/src/message.c
index c6bf6da00702a709070a70a5a6ae634618cc5721..ed9b532512c7a4a718328a9c861c5d706e704dee 100644 (file)
--- a/src/message.c
+++ b/src/message.c
@@ -1997,11 +1997,13 @@ msg_prt_line(char_u *s, int list)
                        && curwin->w_lcs_chars.leadmultispace != NULL)
                {
                    c = curwin->w_lcs_chars.leadmultispace[multispace_pos++];
-                   if (curwin->w_lcs_chars.leadmultispace[multispace_pos] == NUL)
+                   if (curwin->w_lcs_chars.leadmultispace[multispace_pos]
+                                                                       == NUL)
                        multispace_pos = 0;
                    attr = HL_ATTR(HLF_8);
                }
-               else if (lead != NULL && s <= lead && curwin->w_lcs_chars.lead)
+               else if (lead != NULL && s <= lead
+                                           && curwin->w_lcs_chars.lead != NUL)
                {
                    c = curwin->w_lcs_chars.lead;
                    attr = HL_ATTR(HLF_8);
@@ -2011,14 +2013,6 @@ msg_prt_line(char_u *s, int list)
                    c = curwin->w_lcs_chars.trail;
                    attr = HL_ATTR(HLF_8);
                }
-               else if (list && lead != NULL && s <= lead && in_multispace
-                       && curwin->w_lcs_chars.leadmultispace != NULL)
-               {
-                   c = curwin->w_lcs_chars.leadmultispace[multispace_pos++];
-                   if (curwin->w_lcs_chars.leadmultispace[multispace_pos] == NUL)
-                       multispace_pos = 0;
-                   attr = HL_ATTR(HLF_8);
-               }
                else if (list && in_multispace
                        && curwin->w_lcs_chars.multispace != NULL)
                {

diff --git a/src/screen.c b/src/screen.c
index 503587953d182d902e146a84a142357004b32c78..cba7e0b2ba3dfdd5f7371686317a06b3b457e1c9 100644 (file)
--- a/src/screen.c
+++ b/src/screen.c
@@ -4904,6 +4904,7 @@ set_chars_option(win_T *wp, char_u **varp)
            {
                lcs_chars.tab1 = NUL;
                lcs_chars.tab3 = NUL;
+
                if (multispace_len > 0)
                {
                    lcs_chars.multispace = ALLOC_MULT(int, multispace_len + 1);
@@ -5028,7 +5029,8 @@ set_chars_option(win_T *wp, char_u **varp)
                    s = p + len2 + 1;
                    if (round == 0)
                    {
-                       // Get length of lcsmultispace string in first round
+                       // get length of lcs-leadmultispace string in first
+                       // round
                        last_lmultispace = p;
                        lead_multispace_len = 0;
                        while (*s != NUL && *s != ',')
@@ -5039,7 +5041,7 @@ set_chars_option(win_T *wp, char_u **varp)
                            ++lead_multispace_len;
                        }
                        if (lead_multispace_len == 0)
-                           // lcsmultispace cannot be an empty string
+                           // lcs-leadmultispace cannot be an empty string
                            return e_invalid_argument;
                        p = s;
                    }
@@ -5066,10 +5068,8 @@ set_chars_option(win_T *wp, char_u **varp)
     }
     if (tab == lcstab)
     {
-       if (wp->w_lcs_chars.multispace != NULL)
-           vim_free(wp->w_lcs_chars.multispace);
-       if (wp->w_lcs_chars.leadmultispace != NULL)
-           vim_free(wp->w_lcs_chars.leadmultispace);
+       vim_free(wp->w_lcs_chars.multispace);
+       vim_free(wp->w_lcs_chars.leadmultispace);
        wp->w_lcs_chars = lcs_chars;
     }
 

diff --git a/src/version.c b/src/version.c
index de4f27cdbe96993c6bbbbe46da9701266a0048cd..5163254aed86ba0c8ed3a9d9fcf5e70d9921c635 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    5070,
 /**/
     5069,
 /**/