Merged in changes from CVS trunk.

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-450
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-451
   Update from CVS: lisp/subr.el (get-buffer-window-list): Doc fix.

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-452
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-453
   Update from CVS


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-218

1 files changed, 2 insertions, 0 deletions

diff --git a/src/alloc.c b/src/alloc.c
index 5dc8d186369..955f274c270 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -5035,6 +5035,7 @@ mark_object (arg)
           break;
 
         case Lisp_Misc_Save_Value:
+#if GC_MARK_STACK
           {
             register struct Lisp_Save_Value *ptr = XSAVE_VALUE (obj);
             /* If DOGC is set, POINTER is the address of a memory
@@ -5047,6 +5048,7 @@ mark_object (arg)
                   mark_maybe_object (*p);
               }
           }
+#endif
           break;
 
         case Lisp_Misc_Overlay: