Redo VFM interface. Get rid of compaction_necessary, compaction_nval,

[pspp-builds.git] / src / modify-vars.c

diff --git a/src/modify-vars.c b/src/modify-vars.c
index ed28ee4c671d4a0df0c4a185e9ec0dcb4b93930d..46fe644d105b7bd0c7520449e4ff415606ce8eb3 100644 (file)
--- a/src/modify-vars.c
+++ b/src/modify-vars.c
@@ -83,6 +83,13 @@ cmd_modify_vars (void)
 
   size_t i;
 
+  if (temporary != 0)
+    {
+      msg (SE, _("MODIFY VARS may not be used after TEMPORARY.  "
+                 "Temporary transformations will be made permanent."));
+      cancel_temporary (); 
+    }
+
   lex_match_id ("MODIFY");
   lex_match_id ("VARS");
 
@@ -309,7 +316,7 @@ cmd_modify_vars (void)
   if (already_encountered & (1 | 4))
     {
       /* Read the data. */
-      procedure (NULL, NULL, NULL);
+      procedure (NULL, NULL);
     }
 
   if (!rearrange_dict (default_dict, &vm))
@@ -360,7 +367,7 @@ struct var_renaming
    var_renaming structures A and B. */
 static int
 compare_var_renaming_by_new_name (const void *a_, const void *b_,
-                                  void *foo unused) 
+                                  void *foo UNUSED) 
 {
   const struct var_renaming *a = a_;
   const struct var_renaming *b = b_;