diff options
| author | Eli Zaretskii | 2010-10-29 12:43:38 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2010-10-29 12:43:38 +0200 |
| commit | ffe75e6b11498ef4e105aed8f650db343194c9e2 (patch) | |
| tree | a2b6ca8b038076fc12f6bb5f0339a39e529dd9a5 /src/ChangeLog | |
| parent | 95de0327d08519791252386914c514db860d7588 (diff) | |
| download | emacs-ffe75e6b11498ef4e105aed8f650db343194c9e2.tar.gz emacs-ffe75e6b11498ef4e105aed8f650db343194c9e2.zip | |
Fix 2010-10-29T06:51:36Z!rgm@gnu.org for non-CLASH_DETECTION platforms.
emacs.c (main): Call syms_of_filelock unconditionally.
filelock.c (syms_of_filelock): Move out of #ifdef CLASH_DETECTION
clause, but keep part of it conditioned on CLASH_DETECTION.
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index c56e38dbe60..2d46e42e17b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,10 @@ | |||
| 1 | 2010-10-29 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * emacs.c (main): Call syms_of_filelock unconditionally. | ||
| 4 | |||
| 5 | * filelock.c (syms_of_filelock): Move out of #ifdef CLASH_DETECTION | ||
| 6 | clause, but keep part of it conditioned on CLASH_DETECTION. | ||
| 7 | |||
| 1 | 2010-10-29 Glenn Morris <rgm@gnu.org> | 8 | 2010-10-29 Glenn Morris <rgm@gnu.org> |
| 2 | 9 | ||
| 3 | * nsfns.m (Fx-display-save-under, Fx-open-connection) | 10 | * nsfns.m (Fx-display-save-under, Fx-open-connection) |