mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-03-01 03:11:09 -08:00
Code Issues Projects Releases Wiki Activity

(cmd_error_internal): Don't exit in daemon mode, bug#1310.

Browse source
This commit is contained in:
Stefan Monnier 2008-12-21 04:13:46 +00:00
parent e3ca2c4b7e
commit 5e252df234
2 changed files with 16 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/ChangeLog
View file

@ -1,3 +1,7 @@
2008-12-21 Stefan Monnier <monnier@iro.umontreal.ca>
* keyboard.c (cmd_error_internal): Don't exit in daemon mode, bug#1310.
2008-12-20 Jason Rumney <jasonr@gnu.org>
* frame.c (Fmake_terminal_frame): Raise an error when called from

13
src/keyboard.c
View file

@ -1265,7 +1265,18 @@ cmd_error_internal (data, context)
/* If the window system or terminal frame hasn't been initialized
yet, or we're not interactive, write the message to stderr and exit. */
else if (!sf->glyphs_initialized_p
|| FRAME_INITIAL_P (sf)
/* We used to check if "This is the case of the frame dumped with
Emacs, when we're running under a window system" with
|| (!NILP (Vwindow_system) && !inhibit_window_system
&& FRAME_TERMCAP_P (sf))
then the multi-tty code generalized this check to
|| FRAME_INITIAL_P (sf)
but this leads to undesirable behavior in daemon mode where
we don't want to exit just because we got an error without
having a frame (bug#1310).
So I just removed the check, and rely instead on the `message_*'
functions properly using FRAME_INITIAL_P. In the worst case
this should just make Emacs not exit when it should. */
|| noninteractive)
{
print_error_message (data, Qexternal_debugging_output,