diff options
| author | Jan Djärv <jan.h.d@swipnet.se> | 2012-10-07 12:07:23 +0200 |
|---|---|---|
| committer | Jan Djärv <jan.h.d@swipnet.se> | 2012-10-07 12:07:23 +0200 |
| commit | 335f5ae44485d32ac632bd8d27d5ac00acd63477 (patch) | |
| tree | 0d025e64c7afa71788dab08ddbd7bf055ad2f2aa /src/nsselect.m | |
| parent | 3bc0a2f7e99de90d469b55fcfc9f3f82a99eb0b9 (diff) | |
| download | emacs-335f5ae44485d32ac632bd8d27d5ac00acd63477.tar.gz | |
Check for OSX >= 10.4 to match what the maunal says and what we actually support.
* configure.ac: Check that OSX is 10.4 or newer.
* etc/NEWS (NextStep/OSX port changes): OSX 10.4 or newer is required.
* src/nsfns.m (Fns_list_services): Remove comment and check for OSX < 10.4.
(ns_do_applescript): Remove check for >= MAC_OS_X_VERSION_10_4.
* src/nsimage.m (setPixmapData, getPixelAtX, setAlphaAtX): Remove onTiger.
* src/nsmenu.m (fillWithWidgetValue:): Remove code for < MAC_OS_X_VERSION_10_2.
* src/nsselect.m (ns_string_from_pasteboard): Remove check for >=
MAC_OS_X_VERSION_10_4.
* src/nsterm.h (MAC_OS_X_VERSION_10_3, onTiger): Remove.
(EmacsApp): Remove check for >= MAC_OS_X_VERSION_10_4.
(struct nsfont_info): Remove check for >= MAC_OS_X_VERSION_10_3.
Diffstat (limited to 'src/nsselect.m')
| -rw-r--r-- | src/nsselect.m | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nsselect.m b/src/nsselect.m index 95bc1a95957..c0c412c6fb2 100644 --- a/src/nsselect.m +++ b/src/nsselect.m @@ -295,7 +295,7 @@ ns_string_from_pasteboard (id pb) utfStr = [mstr UTF8String]; length = [mstr lengthOfBytesUsingEncoding: NSUTF8StringEncoding]; -#if ! defined (NS_IMPL_COCOA) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_4 +#if ! defined (NS_IMPL_COCOA) if (!utfStr) { utfStr = [mstr cString]; @@ -306,7 +306,7 @@ ns_string_from_pasteboard (id pb) NS_HANDLER { message1 ("ns_string_from_pasteboard: UTF8String failed\n"); -#if defined (NS_IMPL_COCOA) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4 +#if defined (NS_IMPL_COCOA) utfStr = "Conversion failed"; #else utfStr = [str lossyCString]; |