diff options
| author | Alan Mackenzie | 2017-02-12 10:59:03 +0000 |
|---|---|---|
| committer | Alan Mackenzie | 2017-02-12 10:59:03 +0000 |
| commit | f4d5b687150810129b7a1d5b006e31ccf82b691b (patch) | |
| tree | 4229b13800349032697daae3904dc3773e6b7a80 /src/w32notify.c | |
| parent | d5514332d4a6092673ce1f78fadcae0c57f7be64 (diff) | |
| parent | 148100d98319499f0ac6f57b8be08cbd14884a5c (diff) | |
| download | emacs-comment-cache.tar.gz emacs-comment-cache.zip | |
Merge branch 'master' into comment-cachecomment-cache
Diffstat (limited to 'src/w32notify.c')
| -rw-r--r-- | src/w32notify.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/w32notify.c b/src/w32notify.c index 1f4cbe2df47..25205816bae 100644 --- a/src/w32notify.c +++ b/src/w32notify.c | |||
| @@ -664,7 +664,7 @@ w32_get_watch_object (void *desc) | |||
| 664 | Lisp_Object descriptor = make_pointer_integer (desc); | 664 | Lisp_Object descriptor = make_pointer_integer (desc); |
| 665 | 665 | ||
| 666 | /* This is called from the input queue handling code, inside a | 666 | /* This is called from the input queue handling code, inside a |
| 667 | critical section, so we cannot possibly QUIT if watch_list is not | 667 | critical section, so we cannot possibly quit if watch_list is not |
| 668 | in the right condition. */ | 668 | in the right condition. */ |
| 669 | return NILP (watch_list) ? Qnil : assoc_no_quit (descriptor, watch_list); | 669 | return NILP (watch_list) ? Qnil : assoc_no_quit (descriptor, watch_list); |
| 670 | } | 670 | } |