diff options
| author | Kenichi Handa | 2012-10-07 21:58:14 +0900 |
|---|---|---|
| committer | Kenichi Handa | 2012-10-07 21:58:14 +0900 |
| commit | dade5fca51ce2ed10fdace1cfcf78287599154a1 (patch) | |
| tree | 299c84e1ce2c5a95237b41781113790626d259c5 /src/nsselect.m | |
| parent | 6aa75fb62f6cdc4164d935ef14d57feec5ed6e0a (diff) | |
| parent | 78d876b90e52400b7bbb086ca1a471d3d20d0e98 (diff) | |
| download | emacs-dade5fca51ce2ed10fdace1cfcf78287599154a1.tar.gz emacs-dade5fca51ce2ed10fdace1cfcf78287599154a1.zip | |
merge trunk
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) | |||
| 295 | utfStr = [mstr UTF8String]; | 295 | utfStr = [mstr UTF8String]; |
| 296 | length = [mstr lengthOfBytesUsingEncoding: NSUTF8StringEncoding]; | 296 | length = [mstr lengthOfBytesUsingEncoding: NSUTF8StringEncoding]; |
| 297 | 297 | ||
| 298 | #if ! defined (NS_IMPL_COCOA) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_4 | 298 | #if ! defined (NS_IMPL_COCOA) |
| 299 | if (!utfStr) | 299 | if (!utfStr) |
| 300 | { | 300 | { |
| 301 | utfStr = [mstr cString]; | 301 | utfStr = [mstr cString]; |
| @@ -306,7 +306,7 @@ ns_string_from_pasteboard (id pb) | |||
| 306 | NS_HANDLER | 306 | NS_HANDLER |
| 307 | { | 307 | { |
| 308 | message1 ("ns_string_from_pasteboard: UTF8String failed\n"); | 308 | message1 ("ns_string_from_pasteboard: UTF8String failed\n"); |
| 309 | #if defined (NS_IMPL_COCOA) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4 | 309 | #if defined (NS_IMPL_COCOA) |
| 310 | utfStr = "Conversion failed"; | 310 | utfStr = "Conversion failed"; |
| 311 | #else | 311 | #else |
| 312 | utfStr = [str lossyCString]; | 312 | utfStr = [str lossyCString]; |