From 8e3b4f58f1773f52e23904f802a9a8562f457116 Mon Sep 17 00:00:00 2001 From: Martin Rudalics Date: Tue, 29 Jul 2014 10:51:49 +0200 Subject: [PATCH] In adjust_frame_size use FRAME_WINDOW_P instead of FRAME_X_WINDOW (Bug#18138). * frame.c (adjust_frame_size): Use FRAME_WINDOW_P instead of FRAME_X_WINDOW when calling x_set_window_size (Bug#18138). --- src/ChangeLog | 5 +++++ src/frame.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index 6f864d23332..6fae6782f0d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2014-07-29 Martin Rudalics + + * frame.c (adjust_frame_size): Use FRAME_WINDOW_P instead of + FRAME_X_WINDOW when calling x_set_window_size (Bug#18138). + 2014-07-28 Martin Rudalics * frame.c (x_set_frame_parameters): Revert part of 2014-07-24 diff --git a/src/frame.c b/src/frame.c index a911e71e822..fa9bdfcd065 100644 --- a/src/frame.c +++ b/src/frame.c @@ -484,7 +484,7 @@ adjust_frame_size (struct frame *f, int new_width, int new_height, int inhibit, new_lines = new_text_height / unit_height; #ifdef HAVE_WINDOW_SYSTEM - if (FRAME_X_WINDOW (f) + if (FRAME_WINDOW_P (f) && f->official && ((!inhibit_horizontal && (new_pixel_width != old_pixel_width -- 2.39.2