Mercurial > emacs
changeset 91732:c33ec1f680a9
* frame.c (Qnoelisp): New symbol.
(syms_of_frame): Initialize it.
(Fdelete_frame): Use it to distinguish a mere `force' passed from
someharmles Elisp code, from a strong `force' from x_connection_closed.
* frame.h (Qnoelisp): Declare.
* xterm.c (x_connection_closed): Pass `noelisp'.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Sun, 10 Feb 2008 21:56:38 +0000 |
| parents | 7efbdc83b944 |
| children | e9326c8f35b0 |
| files | src/ChangeLog src/frame.c src/frame.h src/terminal.c src/xterm.c |
| diffstat | 5 files changed, 18 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Sun Feb 10 20:57:47 2008 +0000 +++ b/src/ChangeLog Sun Feb 10 21:56:38 2008 +0000 @@ -1,5 +1,12 @@ 2008-02-10 Stefan Monnier <monnier@iro.umontreal.ca> + * frame.c (Qnoelisp): New symbol. + (syms_of_frame): Initialize it. + (Fdelete_frame): Use it to distinguish a mere `force' passed from + someharmles Elisp code, from a strong `force' from x_connection_closed. + * frame.h (Qnoelisp): Declare. + * xterm.c (x_connection_closed): Pass `noelisp'. + * lisp.h (struct Lisp_Misc_Any, struct Lisp_Marker) (struct Lisp_Overlay, struct Lisp_Kboard_Objfwd) (struct Lisp_Save_Value, struct Lisp_Free): Use enum Lisp_Misc_Type
--- a/src/frame.c Sun Feb 10 20:57:47 2008 +0000 +++ b/src/frame.c Sun Feb 10 21:56:38 2008 +0000 @@ -76,6 +76,7 @@ Lisp_Object Qvisible; Lisp_Object Qdisplay_type; Lisp_Object Qbackground_mode; +Lisp_Object Qnoelisp; Lisp_Object Qx_frame_parameter; Lisp_Object Qx_resource_name; @@ -1406,10 +1407,10 @@ } /* Run `delete-frame-functions' - unless FORCE is true or frame is a tooltip. - FORCE is set when handling a disconnect from the terminal, + unless FORCE is `noelisp' or frame is a tooltip. + FORCE is set to `noelisp' when handling a disconnect from the terminal, so we don't dare call Lisp code. */ - if (!NILP (Vrun_hooks) && NILP (force) + if (!NILP (Vrun_hooks) && EQ (force, Qnoelisp) && NILP (Fframe_parameter (frame, intern ("tooltip")))) { Lisp_Object args[2]; @@ -4395,6 +4396,8 @@ staticpro (&Qdisplay_type); Qbackground_mode = intern ("background-mode"); staticpro (&Qbackground_mode); + Qnoelisp = intern ("noelisp"); + staticpro (&Qnoelisp); Qtty_color_mode = intern ("tty-color-mode"); staticpro (&Qtty_color_mode); Qtty = intern ("tty");
--- a/src/frame.h Sun Feb 10 20:57:47 2008 +0000 +++ b/src/frame.h Sun Feb 10 21:56:38 2008 +0000 @@ -795,6 +795,7 @@ extern Lisp_Object Qframep, Qframe_live_p; extern Lisp_Object Qtty, Qtty_type; extern Lisp_Object Qterminal, Qterminal_live_p; +extern Lisp_Object Qnoelisp; extern struct frame *last_nonminibuf_frame;
--- a/src/terminal.c Sun Feb 10 20:57:47 2008 +0000 +++ b/src/terminal.c Sun Feb 10 21:56:38 2008 +0000 @@ -271,6 +271,7 @@ struct frame *f = XFRAME (frame); if (FRAME_LIVE_P (f) && f->terminal == terminal) { + /* Maybe this should pass Qnoelisp rather than Qt? */ Fdelete_frame (frame, Qt); } }
--- a/src/xterm.c Sun Feb 10 20:57:47 2008 +0000 +++ b/src/xterm.c Sun Feb 10 21:56:38 2008 +0000 @@ -8062,7 +8062,7 @@ && FRAME_X_P (XFRAME (minibuf_frame)) && ! EQ (frame, minibuf_frame) && FRAME_X_DISPLAY_INFO (XFRAME (minibuf_frame)) == dpyinfo) - Fdelete_frame (frame, Qt); + Fdelete_frame (frame, Qnoelisp); } /* Now delete all remaining frames on the dead display. @@ -8075,7 +8075,7 @@ /* Set this to t so that Fdelete_frame won't get confused trying to find a replacement. */ FRAME_KBOARD (XFRAME (frame))->Vdefault_minibuffer_frame = Qt; - Fdelete_frame (frame, Qt); + Fdelete_frame (frame, Qnoelisp); } /* We have to close the display to inform Xt that it doesn't @@ -8087,7 +8087,7 @@ M-x make-frame-on-display RET :1 RET will indefinitely wait in Xt for events for display `:1', opened - in the first class to make-frame-on-display. + in the first call to make-frame-on-display. Closing the display is reported to lead to a bus error on OpenWindows in certain situations. I suspect that is a bug