diff options
| author | Glenn Morris | 2020-01-11 07:50:31 -0800 |
|---|---|---|
| committer | Glenn Morris | 2020-01-11 07:50:31 -0800 |
| commit | 41d9d51cf5ac5b76c09802388e1691cf489d9d9d (patch) | |
| tree | 6171164ad07da6a4a5ded5287d71efb3f5e6e4a5 /src | |
| parent | 17cfd708575c351d030f8b05c5921d1867028d79 (diff) | |
| parent | f0ebd919c16c71d1010f2625425932e46b58f8b4 (diff) | |
| download | emacs-41d9d51cf5ac5b76c09802388e1691cf489d9d9d.tar.gz emacs-41d9d51cf5ac5b76c09802388e1691cf489d9d9d.zip | |
Merge from origin/emacs-27
f0ebd919c1 (origin/emacs-27) ; * doc/lispref/anti.texi (Antinews): Fi...
6f059159ee Update Acknowledgments sections
e1262d45f9 Update Antinews in ELisp manual
fd8128f0c1 ; Move the description of define-inline to a different nod...
524441d6b3 Improve wording in the ELisp manual
8addfa91c8 Reset to the standard value when reverting session's custo...
d6f9b09777 Fix saving multiple themes
c556aabde8 Calc: fix interval entry (bug#39040)
91cd3c1372 Fix horizontal line display in Custom buffers
15c8e984ae ; * etc/NEWS: Fix a typo.
ff8996a337 flymake: fix typo in variable binding (bug#38752)
16eaaa07e6 ; Minor spelling fixes
5efe795659 Update Antinews in the Emacs manual
5841240295 Use NSNumber instead of BOOL (bug#39047)
beec9f64a5 Add comment on fido-mode's file-sorting semantics
eb3c6ad325 Consider non-string minibuffer-default in icomplete
# Conflicts:
# etc/NEWS
Diffstat (limited to 'src')
| -rw-r--r-- | src/nsfns.m | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nsfns.m b/src/nsfns.m index f2857c022ee..42bd88eeb47 100644 --- a/src/nsfns.m +++ b/src/nsfns.m | |||
| @@ -499,11 +499,11 @@ ns_set_represented_filename (struct frame *f) | |||
| 499 | #if defined (NS_IMPL_COCOA) && defined (MAC_OS_X_VERSION_10_7) | 499 | #if defined (NS_IMPL_COCOA) && defined (MAC_OS_X_VERSION_10_7) |
| 500 | /* Work around for Mach port leaks on macOS 10.15 (bug#38618). */ | 500 | /* Work around for Mach port leaks on macOS 10.15 (bug#38618). */ |
| 501 | NSURL *fileURL = [NSURL fileURLWithPath:fstr isDirectory:NO]; | 501 | NSURL *fileURL = [NSURL fileURLWithPath:fstr isDirectory:NO]; |
| 502 | BOOL isUbiquitousItem = YES; | 502 | NSNumber *isUbiquitousItem = @YES; |
| 503 | [fileURL getResourceValue:(id *)&isUbiquitousItem | 503 | [fileURL getResourceValue:(id *)&isUbiquitousItem |
| 504 | forKey:NSURLIsUbiquitousItemKey | 504 | forKey:NSURLIsUbiquitousItemKey |
| 505 | error:nil]; | 505 | error:nil]; |
| 506 | if (isUbiquitousItem) | 506 | if ([isUbiquitousItem boolValue]) |
| 507 | fstr = @""; | 507 | fstr = @""; |
| 508 | #endif | 508 | #endif |
| 509 | 509 | ||