diff options
| author | Jan Djärv | 2013-11-20 14:03:43 +0100 |
|---|---|---|
| committer | Jan Djärv | 2013-11-20 14:03:43 +0100 |
| commit | f03f7d3dc0ff04153e6d6b3c0bc8e16cb8225e95 (patch) | |
| tree | dc2a72230d8849a5997615dbfccf8a0dc56f1201 /src | |
| parent | 19594366789090aec9b7527ae5676ad2b4c129b2 (diff) | |
| download | emacs-f03f7d3dc0ff04153e6d6b3c0bc8e16cb8225e95.tar.gz emacs-f03f7d3dc0ff04153e6d6b3c0bc8e16cb8225e95.zip | |
* nsterm.m (init, run, stop:): Comment out for now, does not work with dialogs.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/nsterm.m | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 7b225d7f188..2b22e09461f 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2013-11-20 Jan Djärv <jan.h.d@swipnet.se> | ||
| 2 | |||
| 3 | * nsterm.m (init, run, stop:): Comment out for now, does not work | ||
| 4 | with dialogs. | ||
| 5 | |||
| 1 | 2013-11-19 Paul Eggert <eggert@cs.ucla.edu> | 6 | 2013-11-19 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 7 | ||
| 3 | * charset.c (syms_of_charset): Don't read past end of string. | 8 | * charset.c (syms_of_charset): Don't read past end of string. |
diff --git a/src/nsterm.m b/src/nsterm.m index 0e7667b6dc6..991be1f0396 100644 --- a/src/nsterm.m +++ b/src/nsterm.m | |||
| @@ -4367,6 +4367,7 @@ ns_term_shutdown (int sig) | |||
| 4367 | 4367 | ||
| 4368 | @implementation EmacsApp | 4368 | @implementation EmacsApp |
| 4369 | 4369 | ||
| 4370 | #if 0 | ||
| 4370 | #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_9 | 4371 | #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_9 |
| 4371 | - (id)init | 4372 | - (id)init |
| 4372 | { | 4373 | { |
| @@ -4406,6 +4407,7 @@ ns_term_shutdown (int sig) | |||
| 4406 | shouldKeepRunning = NO; | 4407 | shouldKeepRunning = NO; |
| 4407 | } | 4408 | } |
| 4408 | #endif | 4409 | #endif |
| 4410 | #endif | ||
| 4409 | 4411 | ||
| 4410 | - (void)logNotification: (NSNotification *)notification | 4412 | - (void)logNotification: (NSNotification *)notification |
| 4411 | { | 4413 | { |