Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
fe2f33e8
Commit
fe2f33e8
authored
Aug 11, 2014
by
Jan Djärv
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix default width not being 80, but 77.
* nsfns.m (Fx_create_frame): Call adjust_frame_size, set f->official.
parent
c7367d2d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
10 deletions
+11
-10
src/ChangeLog
src/ChangeLog
+5
-0
src/nsfns.m
src/nsfns.m
+6
-10
No files found.
src/ChangeLog
View file @
fe2f33e8
2014-08-11 Jan Djärv <jan.h.d@swipnet.se>
* nsfns.m (Fx_create_frame): Call adjust_frame_size,
set f->official.
2014-08-11 Glenn Morris <rgm@gnu.org>
* fileio.c: Revert 2013-01-31 change, which chose coding system for
...
...
src/nsfns.m
View file @
fe2f33e8
...
...
@@ -1267,11 +1267,8 @@ Turn the input menu (an NSMenu) into a lisp list for tracking on lisp side
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 @@ Turn the input menu (an NSMenu) into a lisp list for tracking on lisp side
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
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment