diff options
| author | Eli Zaretskii | 2012-07-23 19:57:20 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2012-07-23 19:57:20 +0300 |
| commit | 436bc8e0a73e02ed0840633c4d4d4922a222db24 (patch) | |
| tree | 2abf02a155efdc34837295c07b74de3593c2423e /src/window.c | |
| parent | dfce923ac9b8e14bcb2937617775cc310745978a (diff) | |
| download | emacs-436bc8e0a73e02ed0840633c4d4d4922a222db24.tar.gz emacs-436bc8e0a73e02ed0840633c4d4d4922a222db24.zip | |
Fix bug #12025 with a crash when displaying tooltips.
src/print.c (print_object): Don't crash when a frame's name is nil
or invalid.
src/window.c (decode_any_window): Disable CHECK_LIVE_FRAME test, as
it signals an error when a tooltip frame is being created.
Diffstat (limited to 'src/window.c')
| -rw-r--r-- | src/window.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/window.c b/src/window.c index b7b6e283cc1..e80462ae945 100644 --- a/src/window.c +++ b/src/window.c | |||
| @@ -151,7 +151,8 @@ decode_any_window (register Lisp_Object window) | |||
| 151 | 151 | ||
| 152 | CHECK_WINDOW (window); | 152 | CHECK_WINDOW (window); |
| 153 | w = XWINDOW (window); | 153 | w = XWINDOW (window); |
| 154 | CHECK_LIVE_FRAME (w->frame); | 154 | /* The following test throws up every time a tooltip frame is displayed. */ |
| 155 | /* CHECK_LIVE_FRAME (w->frame); */ | ||
| 155 | return w; | 156 | return w; |
| 156 | } | 157 | } |
| 157 | 158 | ||