From 381198220568f3100740fdbf9cba2fe7d573e345 Mon Sep 17 00:00:00 2001 From: Gerd Moellmann Date: Tue, 9 Jan 2001 13:46:53 +0000 Subject: [PATCH] (do_auto_save_unwind): Do the pop_message here instead of in Fdo_auto_save. (Fdo_auto_save): Don't call pop_message. --- src/ChangeLog | 16 ++++++++++++++++ src/fileio.c | 4 ++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index b980a9524b5..7a36b02cd67 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,19 @@ +2001-01-09 Gerd Moellmann + + * alloc.c (Fgarbage_collect): Use a record_unwind_protect to + ensure that pop_message is called. + + * keyboard.c (Fexecute_extended_command): Use a + record_unwind_protect to ensure that pop_message is called. + + * lisp.h (push_message_unwind): Add prototype. + + * xdisp.c (push_message_unwind): New function. + + * fileio.c (do_auto_save_unwind): Do the pop_message here + instead of in Fdo_auto_save. + (Fdo_auto_save): Don't call pop_message. + 2001-01-08 Ken Raeburn * xfns.c (xpm_load) [!ALLOC_XPM_COLORS]: Declare local variable I diff --git a/src/fileio.c b/src/fileio.c index 2e4f2f2f801..eb6421a1374 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -1,5 +1,5 @@ /* File IO for GNU Emacs. - Copyright (C) 1985,86,87,88,93,94,95,96,97,98,99,2000 + Copyright (C) 1985,86,87,88,93,94,95,96,97,98,99,2000, 2001 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -5279,6 +5279,7 @@ do_auto_save_unwind (stream) /* used as unwind-protect function */ if (!NILP (stream)) fclose ((FILE *) (XFASTINT (XCAR (stream)) << 16 | XFASTINT (XCDR (stream)))); + pop_message (); return Qnil; } @@ -5474,7 +5475,6 @@ A non-nil CURRENT-ONLY argument means save only current buffer.") Vquit_flag = oquit; - pop_message (); unbind_to (count, Qnil); return Qnil; } -- 2.39.2