(clone_per_buffer_values): Skip `name'.

4b7cdc0e · Stefan Monnier · f7ed19a3 · 4b7cdc0e · 4b7cdc0e
Commit 4b7cdc0e authored Jun 11, 2008 by Stefan Monnier
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 1 deletion

src/ChangeLog src/ChangeLog +4 -0

src/buffer.c src/buffer.c +5 -1

No files found.
--- a/src/ChangeLog
+++ b/src/ChangeLog
+2008-06-11  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* buffer.c (clone_per_buffer_values): Skip `name'.
+
 2008-06-11  Chong Yidong  <cyd@stupidchicken.com>

 	* font.c (font_parse_fcname): Fix last change; accept decimal

--- a/src/buffer.c
+++ b/src/buffer.c
@@ -496,12 +496,16 @@ clone_per_buffer_values (from, to)

  /* buffer-local Lisp variables start at `undo_list',
     tho only the ones from `name' on are GC'd normally.  */
-  for (offset = PER_BUFFER_VAR_OFFSET (undo_list) + sizeof (Lisp_Object);
+  for (offset = PER_BUFFER_VAR_OFFSET (undo_list);
       offset < sizeof *to;
       offset += sizeof (Lisp_Object))
    {
      Lisp_Object obj;

+      /* Don't touch the `name' which should be unique for every buffer.  */
+      if (offset == PER_BUFFER_VAR_OFFSET (name))
+	continue;
+
      obj = PER_BUFFER_VALUE (from, offset);
      if (MARKERP (obj))
 	{