procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix last change

Browse source 
* src/xdisp.c (handle_line_prefix): Set the 'align_visually_p'
only after pushing the iterator.
(pop_it): Reset the 'align_visually_p' flag.  (Bug#71605)
This commit is contained in:
Eli Zaretskii 2024-06-20 13:42:04 +03:00
parent 775aeabcfb
commit 74af691b90
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/xdisp.c
View file

@ -7288,6 +7288,7 @@ pop_it (struct it *it)
it->bidi_p = p->bidi_p;
it->paragraph_embedding = p->paragraph_embedding;
it->from_disp_prop_p = p->from_disp_prop_p;
it->align_visually_p = false;
if (it->bidi_p)
{
bidi_pop_it (&it->bidi_it);
@ -24488,17 +24489,14 @@ static void
handle_line_prefix (struct it *it)
{
Lisp_Object prefix;
bool wrap_prop = false;
if (it->continuation_lines_width > 0)
{
prefix = get_line_prefix_it_property (it, Qwrap_prefix);
if (NILP (prefix))
prefix = Vwrap_prefix;
/* Interpreting :align-to relative to the beginning of the logical
line effectively renders this feature unusable, so we make an
exception for this use of :align-to. */
if (!NILP (prefix))
it->align_visually_p = true;
wrap_prop = true;
}
else
{
@ -24513,6 +24511,11 @@ handle_line_prefix (struct it *it)
iterator stack overflows. So, don't wrap the prefix. */
it->line_wrap = TRUNCATE;
it->avoid_cursor_p = true;
/* Interpreting :align-to relative to the beginning of the logical
line effectively renders this feature unusable, so we make an
exception for this use of :align-to. */
if (wrap_prop && CONSP (prefix) && EQ (XCAR (prefix), Qspace))
it->align_visually_p = true;
}
}