diff options
| author | Jan Djärv | 2014-07-27 16:45:26 +0200 |
|---|---|---|
| committer | Jan Djärv | 2014-07-27 16:45:26 +0200 |
| commit | 96fa02baec9bab4ed7610970ab1058051312f584 (patch) | |
| tree | 48890f5ce2de55a08d1b3ee306e89838deedffdc /src | |
| parent | 3477e27021dbe9366c3c1aaba80feb72f1138b29 (diff) | |
| download | emacs-96fa02baec9bab4ed7610970ab1058051312f584.tar.gz emacs-96fa02baec9bab4ed7610970ab1058051312f584.zip | |
Reinstate removed code.
* nsterm.m (applicationDidFinishLaunching antialiasThresholdDidChange):
Reinstate code removed by the prevoius commit to this file.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/nsterm.m | 21 |
2 files changed, 26 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 28fc913903c..64c8adae816 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2014-07-27 Jan Djärv <jan.h.d@swipnet.se> | ||
| 2 | |||
| 3 | * nsterm.m (applicationDidFinishLaunching antialiasThresholdDidChange): | ||
| 4 | Reinstate code removed by the prevoius commit to this file. | ||
| 5 | |||
| 1 | 2014-07-27 Martin Rudalics <rudalics@gmx.at> | 6 | 2014-07-27 Martin Rudalics <rudalics@gmx.at> |
| 2 | 7 | ||
| 3 | * buffer.h (struct buffer): New fields scroll_bar_height and | 8 | * buffer.h (struct buffer): New fields scroll_bar_height and |
diff --git a/src/nsterm.m b/src/nsterm.m index 9c64ab5f93b..47ad28aaa61 100644 --- a/src/nsterm.m +++ b/src/nsterm.m | |||
| @@ -4687,9 +4687,30 @@ ns_term_shutdown (int sig) | |||
| 4687 | ((EmacsApp *)self)->applicationDidFinishLaunchingCalled = YES; | 4687 | ((EmacsApp *)self)->applicationDidFinishLaunchingCalled = YES; |
| 4688 | #endif | 4688 | #endif |
| 4689 | [NSApp setServicesProvider: NSApp]; | 4689 | [NSApp setServicesProvider: NSApp]; |
| 4690 | |||
| 4691 | [self antialiasThresholdDidChange:nil]; | ||
| 4692 | #ifdef NS_IMPL_COCOA | ||
| 4693 | #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 | ||
| 4694 | [[NSNotificationCenter defaultCenter] | ||
| 4695 | addObserver:self | ||
| 4696 | selector:@selector(antialiasThresholdDidChange:) | ||
| 4697 | name:NSAntialiasThresholdChangedNotification | ||
| 4698 | object:nil]; | ||
| 4699 | #endif | ||
| 4700 | #endif | ||
| 4701 | |||
| 4690 | ns_send_appdefined (-2); | 4702 | ns_send_appdefined (-2); |
| 4691 | } | 4703 | } |
| 4692 | 4704 | ||
| 4705 | - (void)antialiasThresholdDidChange:(NSNotification *)notification | ||
| 4706 | { | ||
| 4707 | #ifdef NS_IMPL_COCOA | ||
| 4708 | #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 | ||
| 4709 | macfont_update_antialias_threshold (); | ||
| 4710 | #endif | ||
| 4711 | #endif | ||
| 4712 | } | ||
| 4713 | |||
| 4693 | 4714 | ||
| 4694 | /* Termination sequences: | 4715 | /* Termination sequences: |
| 4695 | C-x C-c: | 4716 | C-x C-c: |