aboutsummaryrefslogtreecommitdiffstats
path: root/src/alloc.c
diff options
context:
space:
mode:
authorStefan Monnier2014-03-20 10:09:37 -0400
committerStefan Monnier2014-03-20 10:09:37 -0400
commitcaecb91c581d4ec0fc008a35005d8009f43087ee (patch)
treea1ec19db2c583f3dfea1c53b26c6936f978bbad9 /src/alloc.c
parent7b9cb5448748b75a15840b7fba080cdcb341d0f7 (diff)
downloademacs-caecb91c581d4ec0fc008a35005d8009f43087ee.tar.gz
emacs-caecb91c581d4ec0fc008a35005d8009f43087ee.zip
* src/frame.h (SET_FRAME_VISIBLE): Keep frame_garbaged up to date.
* src/xterm.c (handle_one_xevent) <MapNotify>: Don't garbage the frame. * src/frame.c (frame_garbaged): Make "docstring" more precise.
Diffstat (limited to 'src/alloc.c')
-rw-r--r--src/alloc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/alloc.c b/src/alloc.c
index 7c671e25cfc..62c3beec1d2 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -1138,8 +1138,8 @@ lisp_align_malloc (size_t nbytes, enum mem_type type)
1138 } 1138 }
1139 1139
1140 abase = ABLOCK_ABASE (free_ablock); 1140 abase = ABLOCK_ABASE (free_ablock);
1141 ABLOCKS_BUSY (abase) = 1141 ABLOCKS_BUSY (abase)
1142 (struct ablocks *) (2 + (intptr_t) ABLOCKS_BUSY (abase)); 1142 = (struct ablocks *) (2 + (intptr_t) ABLOCKS_BUSY (abase));
1143 val = free_ablock; 1143 val = free_ablock;
1144 free_ablock = free_ablock->x.next_free; 1144 free_ablock = free_ablock->x.next_free;
1145 1145