* src/reader.c (copy_definition): Re-use CPP-outed code which

replace precedent remove.
* src/bison.simple: Remove #line before %%prologue because
%%input-line is wrong at this time.

src/bison.simple

@@ -76,7 +76,6 @@ typedef struct yyltype
 #endif
 
 /* Copy the user declarations.  */
-#line %%input-line "%%filename"
 %%prologue
 
 #line %%line "%%skeleton"

src/output.c

@@ -959,6 +959,8 @@ output_parser (const char *skel_filename, struct obstack *oout)
 	    obstack_sgrow (oout, muscle_value);
 	  else if (!strcmp (muscle_key, "line"))
 	    obstack_fgrow1 (oout, "%d", line + 1);
+	  /* How can lineno be correct after having finished reading
+	     input file ? --Marc.  */
 	  else if (!strcmp (muscle_key, "input-line"))
 	    obstack_fgrow1 (oout, "%d", lineno);
 	  else

src/reader.c

@@ -437,14 +437,12 @@ copy_definition (void)
   /* -1 while reading a character if prev char was %. */
   int after_percent;
 
-#if 0
   if (!no_lines_flag)
     {
       obstack_fgrow2 (&attrs_obstack, muscle_find ("linef"),
 		      lineno, quotearg_style (c_quoting_style,
 					      muscle_find("filename")));
     }
-#endif
 
   after_percent = 0;