*** /tmp/ediff3478SQe	2014-08-09 11:04:18.373494252 +0200
--- /home/martin/emacs/quickfixes/src/nsfns.m	2014-08-09 10:44:13.892636675 +0200
***************
*** 1267,1277 ****
    init_frame_faces (f);
  
    /* Read comment about this code in corresponding place in xfns.c.  */
!   width = FRAME_TEXT_WIDTH (f);
!   height = FRAME_TEXT_HEIGHT (f);
!   FRAME_TEXT_HEIGHT (f) = 0;
!   SET_FRAME_WIDTH (f, 0);
!   change_frame_size (f, width, height, 1, 0, 0, 1);
  
    /* The resources controlling the menu-bar and tool-bar are
       processed specially at startup, and reflected in the mode
--- 1267,1274 ----
    init_frame_faces (f);
  
    /* Read comment about this code in corresponding place in xfns.c.  */
!   adjust_frame_size (f, FRAME_COLS (f) * FRAME_COLUMN_WIDTH (f),
! 		     FRAME_LINES (f) * FRAME_LINE_HEIGHT (f), 5, 1);
  
    /* The resources controlling the menu-bar and tool-bar are
       processed specially at startup, and reflected in the mode
***************
*** 1342,1352 ****
    x_default_parameter (f, parms, Qfullscreen, Qnil,
                         "fullscreen", "Fullscreen", RES_TYPE_SYMBOL);
  
!   width = FRAME_TEXT_WIDTH (f);
!   height = FRAME_TEXT_HEIGHT (f);
!   FRAME_TEXT_HEIGHT (f) = 0;
!   SET_FRAME_WIDTH (f, 0);
!   change_frame_size (f, width, height, 1, 0, 0, 1);
  
    if (! f->output_data.ns->explicit_parent)
      {
--- 1339,1348 ----
    x_default_parameter (f, parms, Qfullscreen, Qnil,
                         "fullscreen", "Fullscreen", RES_TYPE_SYMBOL);
  
!   /* Consider frame official, now.  */
!   f->official = true;
! 
!   adjust_frame_size (f, FRAME_TEXT_WIDTH (f), FRAME_TEXT_HEIGHT (f), 0, 1);
  
    if (! f->output_data.ns->explicit_parent)
      {