(with_echo_area_buffer): Avoid confusion from reusing

the buffer that was used for echoing.
This commit is contained in:
Gerd Moellmann 2001-04-04 14:06:06 +00:00
parent d8e17bc686
commit 1013f4e380
2 changed files with 13 additions and 0 deletions

View file

@ -1,5 +1,13 @@
2001-04-04 Gerd Moellmann <gerd@gnu.org>
* lisp.h (echoing, echo_message_buffer, cancel_echoing): Declare.
* keyboard.c (echoing, echo_message_buffer): Make externally
visible.
* xdisp.c (with_echo_area_buffer): Avoid confusion from reusing
the buffer that was used for echoing.
* xfaces.c (best_matching_font): Remove unused parameter PATTERN.
(first_font_matching): Removed unused function.
(x_face_list_fonts): Remove unused parameter SCALABLE_P.

View file

@ -6139,6 +6139,11 @@ with_echo_area_buffer (w, which, fn, a1, a2, a3, a4)
buffer = echo_area_buffer[this_one];
/* Don't get confused by reusing the buffer used for echoing
for a different purpose. */
if (!echoing && EQ (buffer, echo_message_buffer))
cancel_echoing ();
record_unwind_protect (unwind_with_echo_area_buffer,
with_echo_area_buffer_unwind_data (w));