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).

diff --git a/src/ChangeLog b/src/ChangeLog
index 6f864d2333241d4ff9bc16e8631b6a8028d28844..6fae6782f0d0831011f382573ee4f8b0df38d1f1 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2014-07-29  Martin Rudalics  <rudalics@gmx.at>
+
+       * 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  <rudalics@gmx.at>
 
        * frame.c (x_set_frame_parameters): Revert part of 2014-07-24

diff --git a/src/frame.c b/src/frame.c
index a911e71e822f4e6087723eb40f9446c6ebc6b852..fa9bdfcd065e96c5a8eaa850b386a98073ac5c85 100644 (file)
--- 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