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>

Author: glepnir

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
 };
 

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

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;
 

src/version.c

@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    772,
 /**/
     771,
 /**/