1 files changed, 4 insertions, 1 deletions

diff --git a/src/undo.c b/src/undo.c
index a498f2aae72..c09da9cddb5 100644
--- a/src/undo.c
+++ b/src/undo.c
@@ -115,7 +115,10 @@ record_delete (beg, string)
 
       while (1)
         {
-          elt = XCAR (tail);
+          if (NILP (tail))
+            elt = Qnil;
+          else
+            elt = XCAR (tail);
           if (NILP (elt) || ! (CONSP (elt) && MARKERP (XCAR (elt))))
             break;
           tail = XCDR (tail);