From: Martin Rudalics <rudalics@gmx.at>
Date: Tue, 29 Jul 2014 08:51:49 +0000 (+0200)
Subject: In adjust_frame_size use FRAME_WINDOW_P instead of FRAME_X_WINDOW (Bug#18138).
X-Git-Tag: emacs-25.0.90~2636^3~10
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8e3b4f58f1773f52e23904f802a9a8562f457116;p=emacs.git

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 6f864d23332..6fae6782f0d 100644
--- 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 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