[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 7e86357 4/6: Merge from origin/emacs-27
From: |
Glenn Morris |
Subject: |
master 7e86357 4/6: Merge from origin/emacs-27 |
Date: |
Wed, 3 Feb 2021 11:11:28 -0500 (EST) |
branch: master
commit 7e86357b423b8b0e197203f874e390e6c7cad6ee
Merge: 0d1e96a 9c75434
Author: Glenn Morris <rgm@gnu.org>
Commit: Glenn Morris <rgm@gnu.org>
Merge from origin/emacs-27
9c75434173 Fix build failure on macOS 10.7 (bug#46036)
ca44ea18ef Improve documentation of auto-resize-tool/tab-bars
---
src/nsfns.m | 2 +-
src/xdisp.c | 6 ++++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/nsfns.m b/src/nsfns.m
index c383e2f..c7857ea 100644
--- a/src/nsfns.m
+++ b/src/nsfns.m
@@ -482,7 +482,7 @@ ns_set_represented_filename (struct frame *f)
#if defined (NS_IMPL_COCOA) && defined (MAC_OS_X_VERSION_10_7)
/* Work around for Mach port leaks on macOS 10.15 (bug#38618). */
NSURL *fileURL = [NSURL fileURLWithPath:fstr isDirectory:NO];
- NSNumber *isUbiquitousItem = @YES;
+ NSNumber *isUbiquitousItem = [NSNumber numberWithBool:YES];
[fileURL getResourceValue:(id *)&isUbiquitousItem
forKey:NSURLIsUbiquitousItemKey
error:nil];
diff --git a/src/xdisp.c b/src/xdisp.c
index efca6f6..eb3f221 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -35110,7 +35110,8 @@ of your window manager. */);
This dynamically changes the tab-bar's height to the minimum height
that is needed to make all tab-bar items visible.
If value is `grow-only', the tab-bar's height is only increased
-automatically; to decrease the tab-bar height, use \\[recenter]. */);
+automatically; to decrease the tab-bar height, use \\[recenter],
+after setting `recenter-redisplay' to the value of t. */);
Vauto_resize_tab_bars = Qt;
DEFVAR_BOOL ("auto-raise-tab-bar-buttons", auto_raise_tab_bar_buttons_p,
@@ -35122,7 +35123,8 @@ automatically; to decrease the tab-bar height, use
\\[recenter]. */);
This dynamically changes the tool-bar's height to the minimum height
that is needed to make all tool-bar items visible.
If value is `grow-only', the tool-bar's height is only increased
-automatically; to decrease the tool-bar height, use \\[recenter]. */);
+automatically; to decrease the tool-bar height, use \\[recenter],
+after setting `recenter-redisplay' to the value of t. */);
Vauto_resize_tool_bars = Qt;
DEFVAR_BOOL ("auto-raise-tool-bar-buttons", auto_raise_tool_bar_buttons_p,
- master updated (ca55e4d -> bd5b4b3), Glenn Morris, 2021/02/03
- master b099f1d 1/6: ; Merge from origin/emacs-27, Glenn Morris, 2021/02/03
- master 0d1e96a 3/6: ; Merge from origin/emacs-27, Glenn Morris, 2021/02/03
- master 17f2be0 2/6: Merge from origin/emacs-27, Glenn Morris, 2021/02/03
- master 1ef8d5e 5/6: ; Merge from origin/emacs-27, Glenn Morris, 2021/02/03
- master 7e86357 4/6: Merge from origin/emacs-27,
Glenn Morris <=
- master bd5b4b3 6/6: Merge from origin/emacs-27, Glenn Morris, 2021/02/03