diff options
| author | Alan Third | 2017-12-10 20:15:52 +0000 |
|---|---|---|
| committer | Alan Third | 2017-12-16 16:35:46 +0000 |
| commit | 95e7195f0d2a30beb2aaa0c324dd6049a168ba5b (patch) | |
| tree | 1a914601410a688511b1112cb16f18fda575d7a0 /src/nsfns.m | |
| parent | f63d9f86b5688ac84ec6e7eecdbb6cac103dbcf2 (diff) | |
| download | emacs-95e7195f0d2a30beb2aaa0c324dd6049a168ba5b.tar.gz emacs-95e7195f0d2a30beb2aaa0c324dd6049a168ba5b.zip | |
Silence macOS 10.13 deprecation notices (Bug#29643)
* src/nsfns.m (Fx_display_backing_store):
(Fx_display_save_under): Don't use NSBackingStoreRetained or
NSBackingStoreNonretained on macOS 10.13+.
* src/nsselect.m (symbol_to_nsstring):
(ns_string_to_symbol):
(nxatoms_of_nsselect): Replace NSGeneralPboard with
NSPasteboardNameGeneral.
* src/nsterm.h: #define NSPasteboardNameGeneral to NSGeneralPboard on
GNUstep and macOS < 10.13.
* src/nsterm.m (EmacsView::resetCursorRects):
(EmacsScroller::resetCursorRects): Don't use setOnMouseEntered on
macOS 10.13+.
Diffstat (limited to 'src/nsfns.m')
| -rw-r--r-- | src/nsfns.m | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/nsfns.m b/src/nsfns.m index 81722681674..064b476fb4e 100644 --- a/src/nsfns.m +++ b/src/nsfns.m | |||
| @@ -1896,10 +1896,12 @@ If omitted or nil, that stands for the selected frame's display. */) | |||
| 1896 | { | 1896 | { |
| 1897 | case NSBackingStoreBuffered: | 1897 | case NSBackingStoreBuffered: |
| 1898 | return intern ("buffered"); | 1898 | return intern ("buffered"); |
| 1899 | #if defined (NS_IMPL_GNUSTEP) || MAC_OS_X_VERSION_MIN_REQUIRED < 101300 | ||
| 1899 | case NSBackingStoreRetained: | 1900 | case NSBackingStoreRetained: |
| 1900 | return intern ("retained"); | 1901 | return intern ("retained"); |
| 1901 | case NSBackingStoreNonretained: | 1902 | case NSBackingStoreNonretained: |
| 1902 | return intern ("non-retained"); | 1903 | return intern ("non-retained"); |
| 1904 | #endif | ||
| 1903 | default: | 1905 | default: |
| 1904 | error ("Strange value for backingType parameter of frame"); | 1906 | error ("Strange value for backingType parameter of frame"); |
| 1905 | } | 1907 | } |
| @@ -1953,9 +1955,11 @@ If omitted or nil, that stands for the selected frame's display. */) | |||
| 1953 | case NSBackingStoreBuffered: | 1955 | case NSBackingStoreBuffered: |
| 1954 | return Qt; | 1956 | return Qt; |
| 1955 | 1957 | ||
| 1958 | #if defined (NS_IMPL_GNUSTEP) || MAC_OS_X_VERSION_MIN_REQUIRED < 101300 | ||
| 1956 | case NSBackingStoreRetained: | 1959 | case NSBackingStoreRetained: |
| 1957 | case NSBackingStoreNonretained: | 1960 | case NSBackingStoreNonretained: |
| 1958 | return Qnil; | 1961 | return Qnil; |
| 1962 | #endif | ||
| 1959 | 1963 | ||
| 1960 | default: | 1964 | default: |
| 1961 | error ("Strange value for backingType parameter of frame"); | 1965 | error ("Strange value for backingType parameter of frame"); |