diff options
| author | Dmitry Antipov | 2012-11-22 13:32:32 +0400 |
|---|---|---|
| committer | Dmitry Antipov | 2012-11-22 13:32:32 +0400 |
| commit | 5c74767510841c8afc35f66f5cb068fe99f29615 (patch) | |
| tree | bc21f52790ac994e4d635b5d13f1947e0f61fed3 /src/alloc.c | |
| parent | 0e70ce9335996bd21c6b7f4ae0bf6b2924b89d4f (diff) | |
| download | emacs-5c74767510841c8afc35f66f5cb068fe99f29615.tar.gz emacs-5c74767510841c8afc35f66f5cb068fe99f29615.zip | |
* alloc.c (Fgarbage_collect): Unblock input after clearing
gc_in_progress to avoid note_mouse_highlight glitch with GC.
* frame.h (FRAME_MOUSE_UPDATE): New macro.
* msdos.c (IT_frame_up_to_date): Use it here...
* w32term.c (w32_frame_up_to_date): ...here...
* xterm.c (XTframe_up_to_date): ...and here...
* nsterm.m (ns_frame_up_to_date): ...but not here.
* lisp.h (Mouse_HLInfo): Remove mouse_face_deferred_gc member.
Adjust users.
* xdisp.c (message2_nolog, message3_nolog, note_mouse_highlight):
Do not check whether GC is in progress.
Diffstat (limited to 'src/alloc.c')
| -rw-r--r-- | src/alloc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/alloc.c b/src/alloc.c index 46b2dde93a3..28c9b51dab4 100644 --- a/src/alloc.c +++ b/src/alloc.c | |||
| @@ -5331,12 +5331,12 @@ See Info node `(elisp)Garbage Collection'. */) | |||
| 5331 | dump_zombies (); | 5331 | dump_zombies (); |
| 5332 | #endif | 5332 | #endif |
| 5333 | 5333 | ||
| 5334 | unblock_input (); | ||
| 5335 | |||
| 5336 | check_cons_list (); | 5334 | check_cons_list (); |
| 5337 | 5335 | ||
| 5338 | gc_in_progress = 0; | 5336 | gc_in_progress = 0; |
| 5339 | 5337 | ||
| 5338 | unblock_input (); | ||
| 5339 | |||
| 5340 | consing_since_gc = 0; | 5340 | consing_since_gc = 0; |
| 5341 | if (gc_cons_threshold < GC_DEFAULT_THRESHOLD / 10) | 5341 | if (gc_cons_threshold < GC_DEFAULT_THRESHOLD / 10) |
| 5342 | gc_cons_threshold = GC_DEFAULT_THRESHOLD / 10; | 5342 | gc_cons_threshold = GC_DEFAULT_THRESHOLD / 10; |