mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-04-27 16:51:06 -07:00
Code Issues Projects Releases Wiki Activity

Revert "Avoid infinite recursion in 'window_wants_header_line'"

Browse source 
This reverts commit 3de8ed09ab.
This is part of removing the recently-added feature whereby
certain non-nil values of 'header-line-format' could signal
that the header line shall not be displayed.  The feature is
being reverted because its advantages are very minor, whereas
the complications it causes are serious.
This commit is contained in:
Eli Zaretskii 2023-06-23 13:44:59 +03:00
parent c31688cb06
commit c964dd0820
1 changed files with 1 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/window.c
View file

@ -5469,7 +5469,6 @@ window_wants_mode_line (struct window *w)
&& WINDOW_PIXEL_HEIGHT (w) > WINDOW_FRAME_LINE_HEIGHT (w));
}
static int header_line_eval_called = 0;
/**
* null_header_line_format:
@ -5497,18 +5496,9 @@ null_header_line_format (Lisp_Object fmt, struct frame *f)
{
if (EQ (car, QCeval))
{
if (header_line_eval_called > 0)
return false;
eassert (header_line_eval_called == 0);
header_line_eval_called++;
val = safe_eval_inhibit_quit (XCAR (XCDR (fmt)));
header_line_eval_called--;
eassert (header_line_eval_called == 0);
if (!FRAME_LIVE_P (f))
{
header_line_eval_called = 0;
signal_error (":eval deleted the frame being displayed", fmt);
}
signal_error (":eval deleted the frame being displayed", fmt);
return NILP (val);
}
val = find_symbol_value (car);