Mercurial > emacs
diff src/ChangeLog @ 111228:6f50064cb399
Fix revno 102144 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.
| author | Eli Zaretskii <eliz@gnu.org> |
|---|---|
| date | Fri, 29 Oct 2010 12:43:38 +0200 |
| parents | b9e560ce3ab6 |
| children | 029e4783cbae e302712538dc |
line wrap: on
line diff
--- a/src/ChangeLog Fri Oct 29 07:22:52 2010 +0000 +++ b/src/ChangeLog Fri Oct 29 12:43:38 2010 +0200 @@ -1,3 +1,10 @@ +2010-10-29 Eli Zaretskii <eliz@gnu.org> + + * 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. + 2010-10-29 Glenn Morris <rgm@gnu.org> * nsfns.m (Fx-display-save-under, Fx-open-connection)