aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJoakim Verona2012-12-11 19:16:48 +0100
committerJoakim Verona2012-12-11 19:16:48 +0100
commit34d8225342adaf408c94a6675cb4da821886ccd3 (patch)
tree4aaff801f0f103074c6e2bcce2f3828719893b44 /src
parent8568160470ec9592c7ec8b515d25a706caf8394a (diff)
parent4a0e1924fc28993d5f95ec58f43b09aa8ee043cb (diff)
downloademacs-34d8225342adaf408c94a6675cb4da821886ccd3.tar.gz
emacs-34d8225342adaf408c94a6675cb4da821886ccd3.zip
auto upstream
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog2
-rw-r--r--src/w32notify.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index c8bf63fe462..3311f7c33a3 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1710,7 +1710,7 @@
1710 1710
17112012-10-19 Stefan Monnier <monnier@iro.umontreal.ca> 17112012-10-19 Stefan Monnier <monnier@iro.umontreal.ca>
1712 1712
1713 * fns.c (Fnreverse): Include the problem element when signalling an 1713 * fns.c (Fnreverse): Include the problem element when signaling an
1714 error (bug#12677). 1714 error (bug#12677).
1715 1715
17162012-10-18 Jan Djärv <jan.h.d@swipnet.se> 17162012-10-18 Jan Djärv <jan.h.d@swipnet.se>
diff --git a/src/w32notify.c b/src/w32notify.c
index 3095103484a..0b7dc9a1110 100644
--- a/src/w32notify.c
+++ b/src/w32notify.c
@@ -217,7 +217,7 @@ watch_completion (DWORD status, DWORD bytes_ret, OVERLAPPED *io_info)
217 /* We've been called because the main thread told us to issue 217 /* We've been called because the main thread told us to issue
218 CancelIo on the directory we watch, and watch_end did so. 218 CancelIo on the directory we watch, and watch_end did so.
219 The directory handle is already closed. We should clean up 219 The directory handle is already closed. We should clean up
220 and exit, signalling to the thread worker routine not to 220 and exit, signaling to the thread worker routine not to
221 issue another call to ReadDirectoryChangesW. Note that we 221 issue another call to ReadDirectoryChangesW. Note that we
222 don't free the dirwatch object itself nor the memory consumed 222 don't free the dirwatch object itself nor the memory consumed
223 by its buffers; this is done by the main thread in 223 by its buffers; this is done by the main thread in