[Emacs-diffs] trunk r117606: In adjust_frame_size use FRAME_WINDOW_P instead of FRAME_X_WINDOW (Bug#18138).

[Martin Rudalics]

------------------------------------------------------------
revno: 117606
revision-id: address@hidden
parent: address@hidden
committer: martin rudalics <address@hidden>
branch nick: trunk
timestamp: Tue 2014-07-29 10:51:49 +0200
message:
  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).
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/frame.c                    frame.c-20091113204419-o5vbwnq5f7feedwu-243

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-07-28 17:03:23 +0000
+++ b/src/ChangeLog     2014-07-29 08:51:49 +0000
@@ -1,3 +1,8 @@
+2014-07-29  Martin Rudalics  <address@hidden>
+
+       * 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  <address@hidden>
 
        * frame.c (x_set_frame_parameters): Revert part of 2014-07-24

=== modified file 'src/frame.c'
--- a/src/frame.c       2014-07-28 17:03:23 +0000
+++ b/src/frame.c       2014-07-29 08:51:49 +0000
@@ -484,7 +484,7 @@
   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