1 files changed, 5 insertions, 1 deletions

diff --git a/src/buffer.c b/src/buffer.c
index bafcb020e8d..04786dcfa86 100644
--- 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))
         {