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

Make display_min_width work from the mode line

Browse source 
* src/xdisp.c (display_min_width): Make this work from mode line
constructs via display_string.
This commit is contained in:
Lars Ingebrigtsen 2021-11-24 14:43:37 +01:00
parent 5b2ba7da4f
commit 4bfa73f920
1 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/xdisp.c
View file

@ -5214,11 +5214,18 @@ display_min_width (struct it *it, ptrdiff_t bufpos,
if (!it->glyph_row)
return;
/* Check that we're really right after the sequence of
characters covered by this `min-width'. */
if (bufpos > BEGV
&& EQ (it->min_width_property,
get_display_property (bufpos - 1, Qmin_width, object)))
/* When called form display_string (i.e., the mode line),
we're being called with a string as the object, and we
may be called with many sub-strings belonging to the same
:propertize run. */
if ((bufpos == 0
&& !EQ (it->min_width_property,
get_display_property (0, Qmin_width, object)))
/* In a buffer -- check that we're really right after the
sequence of characters covered by this `min-width'. */
|| (bufpos > BEGV
&& EQ (it->min_width_property,
get_display_property (bufpos - 1, Qmin_width, object))))
{
Lisp_Object w = Qnil;
double width;
@ -5258,6 +5265,11 @@ display_min_width (struct it *it, ptrdiff_t bufpos,
if (CONSP (width_spec))
{
if (bufpos == BEGV
/* Mode line (see above). */
|| (bufpos == 0
&& !EQ (it->min_width_property,
get_display_property (0, Qmin_width, object)))
/* Buffer. */
|| (bufpos > BEGV
&& !EQ (width_spec,
get_display_property (bufpos - 1, Qmin_width, object))))