diff options
| author | Martin Rudalics | 2018-09-04 08:53:49 +0200 |
|---|---|---|
| committer | Martin Rudalics | 2018-09-04 08:53:49 +0200 |
| commit | 57bcdc76e0518f53cd171c76e726e6bdf646bf9a (patch) | |
| tree | b5acd59cf919aaa31715d9c69117b4697d1c07a5 /src | |
| parent | 82fc6b631306bd42f29a189a3cc9e8f449fa7501 (diff) | |
| download | emacs-57bcdc76e0518f53cd171c76e726e6bdf646bf9a.tar.gz emacs-57bcdc76e0518f53cd171c76e726e6bdf646bf9a.zip | |
Don't call XGetGeometry for frames without outer X window (Bug#32615)
* src/xfns.c (frame_geometry): Don't call XGetGeometry when
FRAME has no outer X window; return nil instead. (Bug#32615)
Diffstat (limited to 'src')
| -rw-r--r-- | src/xfns.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/xfns.c b/src/xfns.c index 3da853ede8a..1381fee57ee 100644 --- a/src/xfns.c +++ b/src/xfns.c | |||
| @@ -5054,7 +5054,7 @@ frame_geometry (Lisp_Object frame, Lisp_Object attribute) | |||
| 5054 | int menu_bar_height = 0, menu_bar_width = 0; | 5054 | int menu_bar_height = 0, menu_bar_width = 0; |
| 5055 | int tool_bar_height = 0, tool_bar_width = 0; | 5055 | int tool_bar_height = 0, tool_bar_width = 0; |
| 5056 | 5056 | ||
| 5057 | if (FRAME_INITIAL_P (f) || !FRAME_X_P (f)) | 5057 | if (FRAME_INITIAL_P (f) || !FRAME_X_P (f) || !FRAME_OUTER_WINDOW (f)) |
| 5058 | return Qnil; | 5058 | return Qnil; |
| 5059 | 5059 | ||
| 5060 | block_input (); | 5060 | block_input (); |