Redo VFM interface. Get rid of compaction_necessary, compaction_nval,

[pspp-builds.git] / src / dfm.c

diff --git a/src/dfm.c b/src/dfm.c
index b5023a82ef9caeeb0c6af468d6c90ea27ec9051d..cec6234f982b94fa33f429c5c01208d54230a520 100644 (file)
--- a/src/dfm.c
+++ b/src/dfm.c
@@ -650,9 +650,8 @@ cmd_begin_data (void)
   /* FIXME: figure out the *exact* conditions, not these really
      lenient conditions. */
   if (vfm_source == NULL
-      || vfm_source == &vfm_memory_stream
-      || vfm_source == &vfm_disk_stream
-      || vfm_source == &sort_stream)
+      || case_source_is_class (vfm_source, &storage_source_class)
+      || case_source_is_class (vfm_source, &sort_source_class))
     {
       msg (SE, _("This command is not valid here since the current "
           "input program does not access the inline file."));
@@ -669,7 +668,7 @@ cmd_begin_data (void)
   /* We don't actually read from the inline file.  The input procedure
      is what reads from it. */
   getl_prompt = GETL_PRPT_DATA;
-  procedure (NULL, NULL, NULL);
+  procedure (NULL, NULL);
 
   ext = inline_file->ext;