[Emacs-diffs] trunk r117687: Fix default width not being 80, but 77.

[Jan D.]

------------------------------------------------------------
revno: 117687
revision-id: address@hidden
parent: address@hidden
committer: Jan Djärv <address@hidden>
branch nick: trunk
timestamp: Mon 2014-08-11 15:16:31 +0200
message:
  Fix default width not being 80, but 77.
  
  * nsfns.m (Fx_create_frame): Call adjust_frame_size,
  set f->official.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/nsfns.m                    nsfns.m-20091113204419-o5vbwnq5f7feedwu-8741

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-08-11 00:59:34 +0000
+++ b/src/ChangeLog     2014-08-11 13:16:31 +0000
@@ -1,3 +1,8 @@
+2014-08-11  Jan Djärv  <address@hidden>
+
+       * nsfns.m (Fx_create_frame): Call adjust_frame_size,
+       set f->official.
+
 2014-08-11  Glenn Morris  <address@hidden>
 
        * fileio.c: Revert 2013-01-31 change, which chose coding system for

=== modified file 'src/nsfns.m'
--- a/src/nsfns.m       2014-07-27 13:21:30 +0000
+++ b/src/nsfns.m       2014-08-11 13:16:31 +0000
@@ -1267,11 +1267,8 @@
   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);
+  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,11 +1339,10 @@
   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);
+  /* 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)
     {