martin/emacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/emacs into emacs-26

Browse Source
This commit is contained in:
Eli Zaretskii
2017-09-23 22:12:49 +03:00
parent 1eef11b7be 00e4e3e9d2
commit 18073beb14
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/nsterm.m
View File

@@ -6824,9 +6824,10 @@ not_in_argv (NSString *arg)
if (wait_for_tool_bar)
{
/* The toolbar height is always 0 in fullscreen, so don't wait
for it to become available. */
/* The toolbar height is always 0 in fullscreen and undecorated
frames, so don't wait for it to become available. */
if (FRAME_TOOLBAR_HEIGHT (emacsframe) == 0
&& FRAME_UNDECORATED (emacsframe) == false
&& ! [self isFullscreen])
{
NSTRACE_MSG ("Waiting for toolbar");
@@ -7207,9 +7208,9 @@ not_in_argv (NSString *arg)
win = [[EmacsWindow alloc]
initWithContentRect: r
styleMask: (FRAME_UNDECORATED (f)
? FRAME_UNDECORATED_FLAGS
: FRAME_DECORATED_FLAGS
styleMask: ((FRAME_UNDECORATED (f)
? FRAME_UNDECORATED_FLAGS
: FRAME_DECORATED_FLAGS)
#ifdef NS_IMPL_COCOA
| NSWindowStyleMaskResizable
| NSWindowStyleMaskMiniaturizable