aboutsummaryrefslogtreecommitdiffstats
path: root/src/window.c
diff options
context:
space:
mode:
authorMartin Rudalics2013-12-03 08:45:54 +0100
committerMartin Rudalics2013-12-03 08:45:54 +0100
commit7303a0aefc1fbabfea1b6b7711a6da2289aecdb2 (patch)
tree3d00b2cab57dac461a9810a9a77f7bdeefd4fbf1 /src/window.c
parent39fa32d6359c8292dd91ce1c58da1aa3f8668bd8 (diff)
downloademacs-7303a0aefc1fbabfea1b6b7711a6da2289aecdb2.tar.gz
emacs-7303a0aefc1fbabfea1b6b7711a6da2289aecdb2.zip
Fix issues related to pixelwise resizing. (Bug#16013) (Bug#16033)
* window.c (Fset_window_new_pixel): Don't choke at negative argument value (Bug#16033). * xfns.c (Fx_create_frame): Add another call to change_frame_size to avoid crash in window_box_height. * gtkutil.h: Fix external declaration of xg_frame_set_char_size. * gtkutil.c (xg_frame_set_char_size, style_changed_cb): Fix size calculation. * xterm.c (x_set_window_size): Fix size calculation (Bug#16013).
Diffstat (limited to 'src/window.c')
-rw-r--r--src/window.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/window.c b/src/window.c
index e2770410bce..1ef2b4a0e38 100644
--- a/src/window.c
+++ b/src/window.c
@@ -3646,10 +3646,12 @@ Note: This function does not operate on any child windows of WINDOW. */)
3646 (Lisp_Object window, Lisp_Object size, Lisp_Object add) 3646 (Lisp_Object window, Lisp_Object size, Lisp_Object add)
3647{ 3647{
3648 struct window *w = decode_valid_window (window); 3648 struct window *w = decode_valid_window (window);
3649 EMACS_INT size_min = (max (INT_MIN, MOST_NEGATIVE_FIXNUM)
3650 + (NILP (add) ? 0 : XINT (w->new_pixel)));
3649 EMACS_INT size_max = (min (INT_MAX, MOST_POSITIVE_FIXNUM) 3651 EMACS_INT size_max = (min (INT_MAX, MOST_POSITIVE_FIXNUM)
3650 - (NILP (add) ? 0 : XINT (w->new_pixel))); 3652 - (NILP (add) ? 0 : XINT (w->new_pixel)));
3651 3653
3652 CHECK_RANGED_INTEGER (size, 0, size_max); 3654 CHECK_RANGED_INTEGER (size, size_min, size_max);
3653 if (NILP (add)) 3655 if (NILP (add))
3654 wset_new_pixel (w, size); 3656 wset_new_pixel (w, size);
3655 else 3657 else