Patch 9.0.0160 (after 9.0.0158)
Problem:    Some diff mode tests fail.
Solution:   Only advance "ptr" when a text property follows.
Files:      src/drawline.c


*** ../vim-9.0.0159/src/drawline.c      2022-08-06 22:02:58.187795341 +0100
--- src/drawline.c      2022-08-06 22:22:28.121144818 +0100
***************
*** 3473,3479 ****
                    ) || lcs_eol_one == -1)
                break;
  #ifdef FEAT_PROP_POPUP
!           if (!wp->w_p_wrap)
            {
                // do not output more of the line, only the "below" prop
                ptr += STRLEN(ptr);
--- 3473,3479 ----
                    ) || lcs_eol_one == -1)
                break;
  #ifdef FEAT_PROP_POPUP
!           if (!wp->w_p_wrap && text_prop_follows)
            {
                // do not output more of the line, only the "below" prop
                ptr += STRLEN(ptr);
*** ../vim-9.0.0159/src/version.c       2022-08-06 22:12:59.994474165 +0100
--- src/version.c       2022-08-06 22:20:31.636224806 +0100
***************
*** 737,738 ****
--- 737,740 ----
  {   /* Add new patch number below this line */
+ /**/
+     160,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
263. You have more e-mail addresses than shorts.

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

-- 
-- 
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php

--- 
You received this message because you are subscribed to the Google Groups 
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
To view this discussion on the web visit 
https://groups.google.com/d/msgid/vim_dev/20220806212410.7FEEE1C0EC3%40moolenaar.net.

Raspunde prin e-mail lui