aboutsummaryrefslogtreecommitdiffstats
path: root/src/xterm.c
diff options
context:
space:
mode:
authorJan Djärv2011-12-03 20:15:20 +0100
committerJan Djärv2011-12-03 20:15:20 +0100
commitc052ead41f5a53da9cc32e7697005fac3506a858 (patch)
tree77d08775bc63f3abc493bde421d90d0abc01fc2a /src/xterm.c
parentcac8708fdec06853fcdaefe4651ebb71c61eebc7 (diff)
downloademacs-c052ead41f5a53da9cc32e7697005fac3506a858.tar.gz
emacs-c052ead41f5a53da9cc32e7697005fac3506a858.zip
* widget.c (update_wm_hints): Return if wmshell is null.
(widget_update_wm_size_hints): New function. * widget.h (widget_update_wm_size_hints): Declare. * xterm.c (x_wm_set_size_hint): If USE_X_TOOLKIT, call widget_update_wm_size_hints. Fixes: debbugs:10104
Diffstat (limited to 'src/xterm.c')
-rw-r--r--src/xterm.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/xterm.c b/src/xterm.c
index e41af2b2870..290acdd9ca4 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -9561,6 +9561,14 @@ x_wm_set_size_hint (struct frame *f, long flags, int user_position)
9561 XSizeHints size_hints; 9561 XSizeHints size_hints;
9562 Window window = FRAME_OUTER_WINDOW (f); 9562 Window window = FRAME_OUTER_WINDOW (f);
9563 9563
9564#ifdef USE_X_TOOLKIT
9565 if (f->output_data.x->widget)
9566 {
9567 widget_update_wm_size_hints (f->output_data.x->widget);
9568 return;
9569 }
9570#endif
9571
9564 /* Setting PMaxSize caused various problems. */ 9572 /* Setting PMaxSize caused various problems. */
9565 size_hints.flags = PResizeInc | PMinSize /* | PMaxSize */; 9573 size_hints.flags = PResizeInc | PMinSize /* | PMaxSize */;
9566 9574