--- datafile.c.orig	Thu Aug 19 23:41:09 1999
+++ datafile.c	Wed Nov  7 20:12:21 2001
@@ -341,7 +341,7 @@
 #ifndef NO_FORTRAN_NUMS
 		count = sscanf(s, "%lf%n", &df_column[df_no_cols].datum, &used);
 #else
-		while (isspace(*s))
+		while (isspace((unsigned char)*s))
 		    ++s;
 		count = *s ? 1 : 0;
 		df_column[df_no_cols].datum = atof(s);
@@ -355,7 +355,7 @@
 		count = *s ? 1 : 0;
 		/* skip chars to end of column */
 		used = 0;
-		while (!isspace((unsigned char) *s) && (*s != NUL))
+		while (!isspace((unsigned char) *s) && *s != ',' && (*s != NUL))
 		    ++s;
 	    }
 
@@ -379,9 +379,11 @@
 
 	++df_no_cols;
 	/*{{{  skip chars to end of column */
-	while ((!isspace((int)*s)) && (*s != '\0'))
+	while ((!isspace((unsigned char)*s)) && *s != ',' && (*s != '\0'))
 	    ++s;
 	/*}}} */
+	if (*s == ',')
+		s++;
 	/*{{{  skip spaces to start of next column */
 	while (isspace((int)*s))
 	    ++s;