From: Eli Zaretskii <eliz@gnu.org>
Date: Wed, 13 Jan 2021 14:45:31 +0000 (+0200)
Subject: Fix 'visual-line-mode' when 'word-wrap-by-category' is in effect
X-Git-Tag: emacs-28.0.90~4279
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=19b169c4e22abe5112d36ff4740f382409f6acdf;p=emacs.git

Fix 'visual-line-mode' when 'word-wrap-by-category' is in effect

* src/xdisp.c (move_it_in_display_line_to): Don't reset
next_may_wrap after saving a potential wrap point.  This fixes the
case where several characters in a row can serve as a wrap point.
(Bug#45837)
---

diff --git a/src/xdisp.c b/src/xdisp.c
index 6a4304d194b..64f401690a6 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -9285,8 +9285,8 @@ move_it_in_display_line_to (struct it *it,
 	      if (may_wrap && char_can_wrap_before (it))
 		{
 		  /* We have reached a glyph that follows one or more
-		     whitespace characters or a character that allows
-		     wrapping after it.  If this character allows
+		     whitespace characters or characters that allow
+		     wrapping after them.  If this character allows
 		     wrapping before it, save this position as a
 		     wrapping point.  */
 		  if (atpos_it.sp >= 0)
@@ -9303,7 +9303,6 @@ move_it_in_display_line_to (struct it *it,
 		    }
 		  /* Otherwise, we can wrap here.  */
 		  SAVE_IT (wrap_it, *it, wrap_data);
-                  next_may_wrap = false;
 		}
               /* Update may_wrap for the next iteration.  */
               may_wrap = next_may_wrap;