patch 9.1.0772: some missing changes from v9.1.0771

Problem:  some missing changes from v9.1.0771
Solution: use correct highlighting attribute and adjust comments
          (glepnir)

closes: #15836

Signed-off-by: glepnir <glephunter@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/src/insexpand.c b/src/insexpand.c
index eb920a751e8635e72768ec7b2a11f4a494320aec..c22eb6dc2f543b36501ae1f30dd0baa924e6c710 100644 (file)
--- a/src/insexpand.c
+++ b/src/insexpand.c
@@ -105,8 +105,7 @@ struct compl_S
     int                cp_flags;               // CP_ values
     int                cp_number;              // sequence number
     int                cp_score;               // fuzzy match score
-    int                cp_user_abbr_hlattr;    // highlight attribute to combine with
-                                       // for abbr.
+    int                cp_user_abbr_hlattr;    // highlight attribute for abbr
     int                cp_user_kind_hlattr;    // highlight attribute for kind
 };
 

diff --git a/src/popupmenu.c b/src/popupmenu.c
index 90ffe0e34237388e846cb94facc5f49ecdade0ee..4d77c666a5e83b968152bc952869f93908e94862 100644 (file)
--- a/src/popupmenu.c
+++ b/src/popupmenu.c
@@ -777,10 +777,7 @@ pum_redraw(void)
                        }
 
                        if (attrs != NULL)
-                       {
-                           vim_free(attrs);
-                           attrs = NULL;
-                       }
+                           VIM_CLEAR(attrs);
 
                        if (*p != TAB)
                            break;
@@ -790,14 +787,14 @@ pum_redraw(void)
                        if (pum_rl)
                        {
                            screen_puts_len((char_u *)"  ", 2, row, col - 1,
-                                                                   orig_attr);
+                                                                   attr);
                            col -= 2;
                        }
                        else
 #endif
                        {
                            screen_puts_len((char_u *)"  ", 2, row, col,
-                                                                   orig_attr);
+                                                                   attr);
                            col += 2;
                        }
                        totwidth += 2;
@@ -826,7 +823,7 @@ pum_redraw(void)
            if (pum_rl)
            {
                screen_fill(row, row + 1, pum_col - basic_width - n + 1,
-                                                   col + 1, ' ', ' ', attr);
+                                                   col + 1, ' ', ' ', orig_attr);
                col = pum_col - basic_width - n;
            }
            else

diff --git a/src/structs.h b/src/structs.h
index debc7df96b7d1995dbcf3bc8bf34debc453943a6..da403ffe34379a3ee2867ae9cba09431384d9723 100644 (file)
--- a/src/structs.h
+++ b/src/structs.h
@@ -4474,7 +4474,7 @@ typedef struct
     char_u     *pum_info;              // extra info
     int                pum_score;              // fuzzy match score
     int                pum_idx;                // index of item before sorting by score
-    int                pum_user_abbr_hlattr;   // highlight attribute to combine with
+    int                pum_user_abbr_hlattr;   // highlight attribute for abbr
     int                pum_user_kind_hlattr;   // highlight attribute for kind
 } pumitem_T;
 

diff --git a/src/version.c b/src/version.c
index 67c05f3ea1eaca430e6ad4f1d1e27b516b7b55d1..37c733233ead519dca0ad0d08d4b1260d7c5fd4c 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    772,
 /**/
     771,
 /**/