diff options
| author | Dmitry Antipov | 2012-08-27 13:30:26 +0400 |
|---|---|---|
| committer | Dmitry Antipov | 2012-08-27 13:30:26 +0400 |
| commit | 5474c384641da64d402e4d135dbf4697a60a70d3 (patch) | |
| tree | 0d0c7d34e0f16d81deb408e459f4695f50b990af | |
| parent | 34f10d412a96624716e83cb5b007dec17c80ee89 (diff) | |
| download | emacs-5474c384641da64d402e4d135dbf4697a60a70d3.tar.gz emacs-5474c384641da64d402e4d135dbf4697a60a70d3.zip | |
Fix spare memory change.
* alloc.c (mark_maybe_pointer): Handle MEM_TYPE_SPARE.
(valid_lisp_object_p): Likewise.
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/alloc.c | 2 |
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 @@ | |||
| 1 | 2012-08-27 Dmitry Antipov <dmantipov@yandex.ru> | ||
| 2 | |||
| 3 | Fix spare memory change. | ||
| 4 | * alloc.c (mark_maybe_pointer): Handle MEM_TYPE_SPARE. | ||
| 5 | (valid_lisp_object_p): Likewise. | ||
| 6 | |||
| 1 | 2012-08-27 Martin Rudalics <rudalics@gmx.at> | 7 | 2012-08-27 Martin Rudalics <rudalics@gmx.at> |
| 2 | 8 | ||
| 3 | * window.c (Fset_window_configuration): Record any window's old | 9 | * 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) | |||
| 4563 | switch (m->type) | 4563 | switch (m->type) |
| 4564 | { | 4564 | { |
| 4565 | case MEM_TYPE_NON_LISP: | 4565 | case MEM_TYPE_NON_LISP: |
| 4566 | case MEM_TYPE_SPARE: | ||
| 4566 | /* Nothing to do; not a pointer to Lisp memory. */ | 4567 | /* Nothing to do; not a pointer to Lisp memory. */ |
| 4567 | break; | 4568 | break; |
| 4568 | 4569 | ||
| @@ -5019,6 +5020,7 @@ valid_lisp_object_p (Lisp_Object obj) | |||
| 5019 | switch (m->type) | 5020 | switch (m->type) |
| 5020 | { | 5021 | { |
| 5021 | case MEM_TYPE_NON_LISP: | 5022 | case MEM_TYPE_NON_LISP: |
| 5023 | case MEM_TYPE_SPARE: | ||
| 5022 | return 0; | 5024 | return 0; |
| 5023 | 5025 | ||
| 5024 | case MEM_TYPE_BUFFER: | 5026 | case MEM_TYPE_BUFFER: |