To: vim_dev@googlegroups.com
Subject: Patch 9.0.0146
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 9.0.0146 (after 9.0.0144)
Problem:    Missing part of change for "override" flag.
Solution:   Add the missing change.
Files:      src/drawline.c


*** ../vim-9.0.0145/src/drawline.c	2022-08-04 15:03:16.253142105 +0100
--- src/drawline.c	2022-08-05 17:03:58.830961119 +0100
***************
*** 348,354 ****
      proptype_T  *text_prop_type = NULL;
      int		text_prop_attr = 0;
      int		text_prop_id = 0;	// active property ID
!     int		text_prop_combine = FALSE;
      int		text_prop_follows = FALSE;  // another text prop to display
  #endif
  #ifdef FEAT_SPELL
--- 348,354 ----
      proptype_T  *text_prop_type = NULL;
      int		text_prop_attr = 0;
      int		text_prop_id = 0;	// active property ID
!     int		text_prop_flags = 0;
      int		text_prop_follows = FALSE;  // another text prop to display
  #endif
  #ifdef FEAT_SPELL
***************
*** 1505,1511 ****
  		}
  
  		text_prop_attr = 0;
! 		text_prop_combine = FALSE;
  		text_prop_type = NULL;
  		text_prop_id = 0;
  		if (text_props_active > 0 && n_extra == 0)
--- 1505,1511 ----
  		}
  
  		text_prop_attr = 0;
! 		text_prop_flags = 0;
  		text_prop_type = NULL;
  		text_prop_id = 0;
  		if (text_props_active > 0 && n_extra == 0)
***************
*** 1535,1541 ****
  			    text_prop_type = pt;
  			    text_prop_attr =
  				   hl_combine_attr(text_prop_attr, used_attr);
! 			    text_prop_combine = pt->pt_flags & PT_FLAG_COMBINE;
  			    text_prop_id = text_props[tpi].tp_id;
  			    other_tpi = used_tpi;
  			    used_tpi = tpi;
--- 1535,1541 ----
  			    text_prop_type = pt;
  			    text_prop_attr =
  				   hl_combine_attr(text_prop_attr, used_attr);
! 			    text_prop_flags = pt->pt_flags;
  			    text_prop_id = text_props[tpi].tp_id;
  			    other_tpi = used_tpi;
  			    used_tpi = tpi;
***************
*** 1566,1572 ****
  			    text_prop_attr = 0;
  			    if (*ptr == NUL)
  				// don't combine char attr after EOL
! 				text_prop_combine = FALSE;
  
  			    // Keep in sync with where
  			    // textprop_size_after_trunc() is called in
--- 1566,1572 ----
  			    text_prop_attr = 0;
  			    if (*ptr == NUL)
  				// don't combine char attr after EOL
! 				text_prop_flags &= ~PT_FLAG_COMBINE;
  
  			    // Keep in sync with where
  			    // textprop_size_after_trunc() is called in
***************
*** 1704,1710 ****
  	    // Combine text property highlight into syntax highlight.
  	    if (text_prop_type != NULL)
  	    {
! 		if (text_prop_combine)
  		    syntax_attr = hl_combine_attr(syntax_attr, text_prop_attr);
  		else
  		    syntax_attr = text_prop_attr;
--- 1704,1710 ----
  	    // Combine text property highlight into syntax highlight.
  	    if (text_prop_type != NULL)
  	    {
! 		if (text_prop_flags & PT_FLAG_COMBINE)
  		    syntax_attr = hl_combine_attr(syntax_attr, text_prop_attr);
  		else
  		    syntax_attr = text_prop_attr;
***************
*** 1760,1765 ****
--- 1760,1770 ----
  		char_attr = 0;
  #endif
  	    }
+ #ifdef FEAT_PROP_POPUP
+ 	    // override with text property highlight when "override" is TRUE
+ 	    if (text_prop_type != NULL && (text_prop_flags & PT_FLAG_OVERRIDE))
+ 		char_attr = hl_combine_attr(char_attr, text_prop_attr);
+ #endif
  	}
  
  	// combine attribute with 'wincolor'
*** ../vim-9.0.0145/src/version.c	2022-08-05 19:46:44.554471098 +0100
--- src/version.c	2022-08-05 20:03:25.976903320 +0100
***************
*** 737,738 ****
--- 737,740 ----
  {   /* Add new patch number below this line */
+ /**/
+     146,
  /**/

-- 
Hear about the guy who played a blank tape at full blast?
The mime next door went nuts.

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///                                                                      \\\
\\\        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///