aboutsummaryrefslogtreecommitdiffstats
path: root/src/alloc.c
diff options
context:
space:
mode:
authorMiles Bader2004-07-17 02:46:48 +0000
committerMiles Bader2004-07-17 02:46:48 +0000
commit21d1ca18bfb71eb82b574fd55339bc7441e6a449 (patch)
tree454ad66687571c05feba856074dca94209292a4a /src/alloc.c
parent89f3c0c9fda25756ee311a6d0467a97bac203eb5 (diff)
parentdd0a3ea36a52518f4fcd2dea97859cfba63158f8 (diff)
downloademacs-21d1ca18bfb71eb82b574fd55339bc7441e6a449.tar.gz
emacs-21d1ca18bfb71eb82b574fd55339bc7441e6a449.zip
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-24
Merge from lorentey@elte.hu--2004/emacs--hacks--0, emacs--cvs-trunk--0 Patches applied: * lorentey@elte.hu--2004/emacs--hacks--0--patch-2 Prevent special events from appending dashes to the echo string. * lorentey@elte.hu--2004/emacs--hacks--0--patch-4 Added ChangeLog entry. * 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 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-454 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-455 Bash the dashes * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-456 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-458 Update from CVS
Diffstat (limited to 'src/alloc.c')
-rw-r--r--src/alloc.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/alloc.c b/src/alloc.c
index 994dc21079f..0e3e78bbac2 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -4990,6 +4990,7 @@ mark_object (arg)
4990 break; 4990 break;
4991 4991
4992 case Lisp_Misc_Save_Value: 4992 case Lisp_Misc_Save_Value:
4993#if GC_MARK_STACK
4993 { 4994 {
4994 register struct Lisp_Save_Value *ptr = XSAVE_VALUE (obj); 4995 register struct Lisp_Save_Value *ptr = XSAVE_VALUE (obj);
4995 /* If DOGC is set, POINTER is the address of a memory 4996 /* If DOGC is set, POINTER is the address of a memory
@@ -5002,6 +5003,7 @@ mark_object (arg)
5002 mark_maybe_object (*p); 5003 mark_maybe_object (*p);
5003 } 5004 }
5004 } 5005 }
5006#endif
5005 break; 5007 break;
5006 5008
5007 case Lisp_Misc_Overlay: 5009 case Lisp_Misc_Overlay: