diff options
| author | Jan Djärv | 2012-07-21 14:10:49 +0200 |
|---|---|---|
| committer | Jan Djärv | 2012-07-21 14:10:49 +0200 |
| commit | 784051c42a953356befde5e9fa4a98b433b55a7c (patch) | |
| tree | 11e16134627c3b92172188822343ad11f0fa018a /src | |
| parent | 4b17afa7a423faeb352c4c578046127a4c5470ed (diff) | |
| download | emacs-784051c42a953356befde5e9fa4a98b433b55a7c.tar.gz emacs-784051c42a953356befde5e9fa4a98b433b55a7c.zip | |
* nsterm.m (accessibilityAttributeValue): Surround with NS_IMPL_COCOA.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 1 | ||||
| -rw-r--r-- | src/nsterm.m | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index ab1f136e6cc..ed0ea6d3a17 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -2,6 +2,7 @@ | |||
| 2 | 2 | ||
| 3 | * nsterm.m (accessibilityAttributeValue): New function. (Bug#11134). | 3 | * nsterm.m (accessibilityAttributeValue): New function. (Bug#11134). |
| 4 | (conversationIdentifier): Return value is NSInteger. | 4 | (conversationIdentifier): Return value is NSInteger. |
| 5 | * nsterm.m (accessibilityAttributeValue): Surround with NS_IMPL_COCOA. | ||
| 5 | 6 | ||
| 6 | 2012-07-21 Chong Yidong <cyd@gnu.org> | 7 | 2012-07-21 Chong Yidong <cyd@gnu.org> |
| 7 | 8 | ||
diff --git a/src/nsterm.m b/src/nsterm.m index 09bbe2c3f5a..e018ea34910 100644 --- a/src/nsterm.m +++ b/src/nsterm.m | |||
| @@ -6038,6 +6038,7 @@ ns_term_shutdown (int sig) | |||
| 6038 | 6038 | ||
| 6039 | @implementation EmacsWindow | 6039 | @implementation EmacsWindow |
| 6040 | 6040 | ||
| 6041 | #ifdef NS_IMPL_COCOA | ||
| 6041 | - (id)accessibilityAttributeValue:(NSString *)attribute | 6042 | - (id)accessibilityAttributeValue:(NSString *)attribute |
| 6042 | { | 6043 | { |
| 6043 | Lisp_Object str = Qnil; | 6044 | Lisp_Object str = Qnil; |
| @@ -6092,6 +6093,7 @@ ns_term_shutdown (int sig) | |||
| 6092 | 6093 | ||
| 6093 | return [super accessibilityAttributeValue:attribute]; | 6094 | return [super accessibilityAttributeValue:attribute]; |
| 6094 | } | 6095 | } |
| 6096 | #endif /* NS_IMPL_COCOA */ | ||
| 6095 | 6097 | ||
| 6096 | /* If we have multiple monitors, one above the other, we don't want to | 6098 | /* If we have multiple monitors, one above the other, we don't want to |
| 6097 | restrict the height to just one monitor. So we override this. */ | 6099 | restrict the height to just one monitor. So we override this. */ |