Mercurial > emacs
changeset 83003:19208c3cbcc9
Fix more SEGV cases in frame.c
src/frame.c (Fmouse_pixel_position, Fraise_frame, Flower_frame)
(Fredirect_frame_focus): Don't do anything if the current frame
is a termcap frame.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-43
| author | Karoly Lorentey <lorentey@elte.hu> |
|---|---|
| date | Sat, 03 Jan 2004 19:06:35 +0000 |
| parents | e654e1383970 |
| children | 7900111db01c |
| files | src/frame.c |
| diffstat | 1 files changed, 8 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/frame.c Sat Jan 03 16:53:54 2004 +0000 +++ b/src/frame.c Sat Jan 03 19:06:35 2004 +0000 @@ -1578,7 +1578,8 @@ #ifdef HAVE_MOUSE /* It's okay for the hook to refrain from storing anything. */ - if (mouse_position_hook) + if (FRAME_TERMCAP_P (f) + && mouse_position_hook) (*mouse_position_hook) (&f, -1, &lispy_dummy, &party_dummy, &x, &y, @@ -1852,7 +1853,8 @@ /* Do like the documentation says. */ Fmake_frame_visible (frame); - if (frame_raise_lower_hook) + if (FRAME_TERMCAP_P (XFRAME (frame)) + && frame_raise_lower_hook) (*frame_raise_lower_hook) (XFRAME (frame), 1); return Qnil; @@ -1872,7 +1874,8 @@ CHECK_LIVE_FRAME (frame); - if (frame_raise_lower_hook) + if (FRAME_TERMCAP_P (XFRAME (frame)) + && frame_raise_lower_hook) (*frame_raise_lower_hook) (XFRAME (frame), 0); return Qnil; @@ -1917,7 +1920,8 @@ XFRAME (frame)->focus_frame = focus_frame; - if (!FRAME_TERMCAP_P (XFRAME (frame)) && frame_rehighlight_hook) + if (!FRAME_TERMCAP_P (XFRAME (frame)) + && frame_rehighlight_hook) (*frame_rehighlight_hook) (XFRAME (frame)); return Qnil;