Index: Parser/tokenizer.c
===================================================================
--- Parser/tokenizer.c	(revision 88320)
+++ Parser/tokenizer.c	(working copy)
@@ -778,7 +778,7 @@
     }
 
     /* XXX: constify members. */
-    tok->buf = tok->cur = tok->end = tok->inp = (char*)str;
+    tok->line_start = tok->buf = tok->cur = tok->end = tok->inp = (char*)str;
     return tok;
 }
 
@@ -807,7 +807,7 @@
     strcpy(tok->encoding, "utf-8");
 
     /* XXX: constify members. */
-    tok->buf = tok->cur = tok->end = tok->inp = (char*)str;
+    tok->line_start = tok->buf = tok->cur = tok->end = tok->inp = (char*)str;
     return tok;
 }
 
@@ -823,7 +823,7 @@
         PyTokenizer_Free(tok);
         return NULL;
     }
-    tok->cur = tok->inp = tok->buf;
+    tok->line_start = tok->cur = tok->inp = tok->buf;
     tok->end = tok->buf + BUFSIZ;
     tok->fp = fp;
     tok->prompt = ps1;