[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-26 18073be 2/5: Merge branch 'emacs-26' of git.savan
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] emacs-26 18073be 2/5: Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/emacs into emacs-26 |
Date: |
Fri, 29 Sep 2017 06:28:26 -0400 (EDT) |
branch: emacs-26
commit 18073beb14f393b4bbcc92890a89dcfcb75fb7ac
Merge: 1eef11b 00e4e3e
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>
Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/emacs into emacs-26
---
src/nsterm.m | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/nsterm.m b/src/nsterm.m
index a41d6be..fb3ebc9 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -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