===================================================================
RCS file: /home/cvs/OpenXM_contrib/gnuplot/Attic/datafile.c,v
retrieving revision 1.1.1.2
retrieving revision 1.1.1.3
diff -u -p -r1.1.1.2 -r1.1.1.3
--- OpenXM_contrib/gnuplot/Attic/datafile.c	2000/01/22 14:15:57	1.1.1.2
+++ OpenXM_contrib/gnuplot/Attic/datafile.c	2003/09/15 07:09:24	1.1.1.3
@@ -1,5 +1,5 @@
 #ifndef lint
-static char *RCSid = "$Id: datafile.c,v 1.1.1.2 2000/01/22 14:15:57 maekawa Exp $";
+static char *RCSid = "$Id: datafile.c,v 1.1.1.3 2003/09/15 07:09:24 ohara Exp $";
 #endif
 
 /* GNUPLOT - datafile.c */
@@ -253,6 +253,10 @@ static char *df_gets()
 {
     int len = 0;
 
+    /* HBB 20000526: prompt user for inline data, if in interactive mode */
+    if (mixed_data_fp && interactive)
+	fputs("input data ('e' ends) > ", stderr);
+
     if (!fgets(line, max_line_len, data_fp))
 	return NULL;
 
@@ -329,14 +333,28 @@ char *s;
 /*
  * optimizations by Corey Satten, corey@cac.washington.edu
  */
-	    if (fast_columns == 0 ||
-		df_no_use_specs > 0 && (use_spec[0].column == dfncp1 ||
-		  df_no_use_specs > 1 && (use_spec[1].column == dfncp1 ||
-		  df_no_use_specs > 2 && (use_spec[2].column == dfncp1 ||
-		  df_no_use_specs > 3 && (use_spec[3].column == dfncp1 ||
-		  df_no_use_specs > 4 && (use_spec[4].column == dfncp1 ||
-					  df_no_use_specs > 5))))) ||
-		df_no_use_specs == 0) {
+
+	    if ((fast_columns == 0)
+		|| (df_no_use_specs == 0)
+		|| ((df_no_use_specs > 0)
+		    && (use_spec[0].column == dfncp1
+			|| (df_no_use_specs > 1
+			    && (use_spec[1].column == dfncp1
+				|| (df_no_use_specs > 2
+				    && (use_spec[2].column == dfncp1
+					|| (df_no_use_specs > 3
+					    && (use_spec[3].column == dfncp1
+						|| (df_no_use_specs > 4 && (use_spec[4].column == dfncp1 || df_no_use_specs > 5)
+						)
+					    )
+					)
+				    )
+				)
+			    )
+			)
+		    )
+		)
+		) {
 
 #ifndef NO_FORTRAN_NUMS
 		count = sscanf(s, "%lf%n", &df_column[df_no_cols].datum, &used);