commit 7baa014d0f73c3b2c6831471d047220633651238
author glepnir <glephunter@gmail.com> Wed Oct 09 20:19:25 2024 +0200
committer Christian Brabandt <cb@256bit.org> Wed Oct 09 20:19:25 2024 +0200
tree 0908f9a8e33c4aac661100a3ee0af9f4f8361dc3
parent 0fe17f8ffbd2588ecd2bf42dced556897bc64f89

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>

src/insexpand.c

diff --git a/src/insexpand.c b/src/insexpand.c
index eb920a7..c22eb6d 100644
--- a/src/insexpand.c
+++ b/src/insexpand.c
@@ -105,8 +105,7 @@
     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

diff --git a/src/popupmenu.c b/src/popupmenu.c
index 90ffe0e..4d77c66 100644
--- a/src/popupmenu.c
+++ b/src/popupmenu.c
@@ -777,10 +777,7 @@
 			}
 
 			if (attrs != NULL)
-			{
-			    vim_free(attrs);
-			    attrs = NULL;
-			}
+			    VIM_CLEAR(attrs);
 
 			if (*p != TAB)
 			    break;
@@ -790,14 +787,14 @@
 			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 @@
 	    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

diff --git a/src/structs.h b/src/structs.h
index debc7df..da403ff 100644
--- a/src/structs.h
+++ b/src/structs.h
@@ -4474,7 +4474,7 @@
     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

diff --git a/src/version.c b/src/version.c
index 67c05f3..37c7332 100644
--- a/src/version.c
+++ b/src/version.c
@@ -705,6 +705,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    772,
+/**/
     771,
 /**/
     770,