diff options
| author | Jan Djärv | 2014-11-08 17:32:37 +0100 |
|---|---|---|
| committer | Jan Djärv | 2014-11-08 17:32:37 +0100 |
| commit | 86b1c771e14efcc98f8fe07510a4238bf94ced7b (patch) | |
| tree | cb7e51bb948167a22af7638f6a8454cbd6e13d5c /src/ChangeLog | |
| parent | 89be8b92a6678ca14cf8f48bdb905542f3b58b9e (diff) | |
| download | emacs-86b1c771e14efcc98f8fe07510a4238bf94ced7b.tar.gz emacs-86b1c771e14efcc98f8fe07510a4238bf94ced7b.zip | |
Attempt to fix NS hang. Will probably cause merge conflicts.
* nsterm.m (init): Replace OSX 10.9 check with IMPL_COCOA.
(run): Ditto. Only use non-system event loop if OSX version is
exactly 10.9.
Fixes: debbugs:18993
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 81e2a27c200..1544df0da8c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2014-11-08 Jan Djärv <jan.h.d@swipnet.se> | ||
| 2 | |||
| 3 | * nsterm.m (init): Replace OSX 10.9 check with IMPL_COCOA. | ||
| 4 | (run): Ditto. Only use non-system event loop if OSX version is | ||
| 5 | exactly 10.9 (Bug#18993). | ||
| 6 | |||
| 1 | 2014-11-07 Michael Albinus <michael.albinus@gmx.de> | 7 | 2014-11-07 Michael Albinus <michael.albinus@gmx.de> |
| 2 | 8 | ||
| 3 | * callproc.c (encode_current_directory): Support handling of file | 9 | * callproc.c (encode_current_directory): Support handling of file |