summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/ChangeLog6
-rw-r--r--src/alloc.c2
2 files changed, 8 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index ee0aeed86f1..2a5afcaa310 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2012-08-27 Dmitry Antipov <dmantipov@yandex.ru>
+
+ Fix spare memory change.
+ * alloc.c (mark_maybe_pointer): Handle MEM_TYPE_SPARE.
+ (valid_lisp_object_p): Likewise.
+
2012-08-27 Martin Rudalics <rudalics@gmx.at>
* window.c (Fset_window_configuration): Record any window's old
diff --git a/src/alloc.c b/src/alloc.c
index 315fea25ef2..36ba22cc535 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -4563,6 +4563,7 @@ mark_maybe_pointer (void *p)
switch (m->type)
{
case MEM_TYPE_NON_LISP:
+ case MEM_TYPE_SPARE:
/* Nothing to do; not a pointer to Lisp memory. */
break;
@@ -5019,6 +5020,7 @@ valid_lisp_object_p (Lisp_Object obj)
switch (m->type)
{
case MEM_TYPE_NON_LISP:
+ case MEM_TYPE_SPARE:
return 0;
case MEM_TYPE_BUFFER: