diff options
| author | Jan Djärv | 2012-08-21 22:50:31 +0200 |
|---|---|---|
| committer | Jan Djärv | 2012-08-21 22:50:31 +0200 |
| commit | d18e2bb65d39d73954c422c1f36657f026cf2f56 (patch) | |
| tree | b72179941e56f3d942901605a87416278f1dda2d /src | |
| parent | 79aba01279160e9c1dea4a4f0b74ef6b2cb9f025 (diff) | |
| download | emacs-d18e2bb65d39d73954c422c1f36657f026cf2f56.tar.gz emacs-d18e2bb65d39d73954c422c1f36657f026cf2f56.zip | |
* nsterm.m (fd_handler:): Alloc and release a NSAutoreleasePool in
the loop.
Fixes: debbugs:12247
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/nsterm.m | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index ffd706a9a82..79406894a58 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2012-08-21 Jan Djärv <jan.h.d@swipnet.se> | ||
| 2 | |||
| 3 | * nsterm.m (fd_handler:): Alloc and release a NSAutoreleasePool in | ||
| 4 | the loop (Bug#12247). | ||
| 5 | |||
| 1 | 2012-08-21 Paul Eggert <eggert@cs.ucla.edu> | 6 | 2012-08-21 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 7 | ||
| 3 | * lisp.h (vcopy): Use memcpy rather than our own loop. | 8 | * lisp.h (vcopy): Use memcpy rather than our own loop. |
diff --git a/src/nsterm.m b/src/nsterm.m index 3ab9358467a..12ca52684e6 100644 --- a/src/nsterm.m +++ b/src/nsterm.m | |||
| @@ -4600,11 +4600,15 @@ not_in_argv (NSString *arg) | |||
| 4600 | 4600 | ||
| 4601 | SELECT_TYPE readfds, writefds, *wfds; | 4601 | SELECT_TYPE readfds, writefds, *wfds; |
| 4602 | EMACS_TIME timeout, *tmo; | 4602 | EMACS_TIME timeout, *tmo; |
| 4603 | NSAutoreleasePool *pool = nil; | ||
| 4603 | 4604 | ||
| 4604 | /* NSTRACE (fd_handler); */ | 4605 | /* NSTRACE (fd_handler); */ |
| 4605 | 4606 | ||
| 4606 | for (;;) | 4607 | for (;;) |
| 4607 | { | 4608 | { |
| 4609 | [pool release]; | ||
| 4610 | pool = [[NSAutoreleasePool alloc] init]; | ||
| 4611 | |||
| 4608 | if (waiting) | 4612 | if (waiting) |
| 4609 | { | 4613 | { |
| 4610 | SELECT_TYPE fds; | 4614 | SELECT_TYPE fds; |