diff options
| author | David Reitter | 2014-11-14 10:56:39 -0500 |
|---|---|---|
| committer | David Reitter | 2014-11-14 18:07:31 -0500 |
| commit | 658b768a6534ae6e77a8547a56fc31b46b63710b (patch) | |
| tree | 5cefd3be29069cbb45e3b99cbce4e02ad11e43cd /src/ChangeLog | |
| parent | f20a19df87444d1977f63dd5b3fc42f4f2d50aa2 (diff) | |
| download | emacs-658b768a6534ae6e77a8547a56fc31b46b63710b.tar.gz emacs-658b768a6534ae6e77a8547a56fc31b46b63710b.zip | |
Time-out NS event loop
OS X 10.10 will, at times, not send us the application-defined
event that is used to terminate the event loop. As a workaround,
we define a timeout and react accordingly. Leaving it in place
for other OSX and NS versions as a safety net.
Partial revert of 2014-11-08T16:32:37Z!jan.h.d@swipnet.se.
Fixes debbugs:18993
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 3bcac1bff33..71b2938694b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2014-11-14 David Reitter <david.reitter@gmail.com> | ||
| 2 | |||
| 3 | * nsterm.m (run): set timeout for event loop to prevent hang. | ||
| 4 | (Bug#18993) | ||
| 5 | |||
| 1 | 2014-11-14 Paul Eggert <eggert@cs.ucla.edu> | 6 | 2014-11-14 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 7 | ||
| 3 | * .gitignore: Add emacs-[1-9]*, to ignore files like emacs-25.0.50.1. | 8 | * .gitignore: Add emacs-[1-9]*, to ignore files like emacs-25.0.50.1. |