[Emacs-diffs] emacs/src ChangeLog keyboard.c

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        08/12/21 04:13:48

Modified files:
        src            : ChangeLog keyboard.c 

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

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7219&r2=1.7220
http://cvs.savannah.gnu.org/viewcvs/emacs/src/keyboard.c?cvsroot=emacs&r1=1.983&r2=1.984

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7219
retrieving revision 1.7220
diff -u -b -r1.7219 -r1.7220
--- ChangeLog   20 Dec 2008 16:00:39 -0000      1.7219
+++ ChangeLog   21 Dec 2008 04:13:46 -0000      1.7220
@@ -1,3 +1,7 @@
+2008-12-21  Stefan Monnier  <address@hidden>
+
+       * keyboard.c (cmd_error_internal): Don't exit in daemon mode, bug#1310.
+
 2008-12-20  Jason Rumney  <address@hidden>
 
        * frame.c (Fmake_terminal_frame): Raise an error when called from

Index: keyboard.c
===================================================================
RCS file: /sources/emacs/emacs/src/keyboard.c,v
retrieving revision 1.983
retrieving revision 1.984
diff -u -b -r1.983 -r1.984
--- keyboard.c  4 Dec 2008 08:53:28 -0000       1.983
+++ keyboard.c  21 Dec 2008 04:13:48 -0000      1.984
@@ -1265,7 +1265,18 @@
   /* 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
+          /* 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,