Common subdirectories: cvs-ro/xc/programs/xmodmap//CVS and cvs-rw/xc/programs/xmodmap//CVS
diff -u cvs-ro/xc/programs/xmodmap//handle.c cvs-rw/xc/programs/xmodmap//handle.c
--- cvs-ro/xc/programs/xmodmap//handle.c	Fri Apr 23 12:54:59 2004
+++ cvs-rw/xc/programs/xmodmap//handle.c	Sat Oct 23 22:40:52 2004
@@ -100,7 +100,7 @@
 static void
 badheader(void)
 {
-    fprintf (stderr, "%s:  %s:%d:  bad ", ProgramName, inputFilename, lineno);
+    fprintf (stderr, "%s:  %s:%d:  bad ", ProgramName, inputFilename, lineno+1);
     parse_errors++;
 }
 
@@ -179,7 +179,7 @@
     }
 
     fprintf (stderr, "%s:  unknown command on line %s:%d\n",
-	     ProgramName, inputFilename, lineno);
+	     ProgramName, inputFilename, lineno+1);
     parse_errors++;
 }
 
diff -u cvs-ro/xc/programs/xmodmap//pf.c cvs-rw/xc/programs/xmodmap//pf.c
--- cvs-ro/xc/programs/xmodmap//pf.c	Sat Oct 23 10:47:05 2004
+++ cvs-rw/xc/programs/xmodmap//pf.c	Sat Oct 23 22:41:32 2004
@@ -114,7 +114,7 @@
     if (i >= 0) cp[len = (i+1)] = '\0';  /* nul terminate */
 
     if (verbose) {
-	printf ("! %d:  %s\n", lineno, cp);
+	printf ("! %d:  %s\n", lineno+1, cp);
     }
 
     /* handle input */