X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=inline;f=src%2Flanguage%2Fstats%2Faggregate.c;h=f4cbaac448b3acfbd67fa81c8775176fbb6b33e0;hb=441a0be4dad876e64150d0e4694263caffc37002;hp=fe6f5eed685993411f035856cc1a0204bf7b3a68;hpb=d9fc15ceb74cdc66487ba9aaed04246170729640;p=pspp

diff --git a/src/language/stats/aggregate.c b/src/language/stats/aggregate.c
index fe6f5eed68..f4cbaac448 100644
--- a/src/language/stats/aggregate.c
+++ b/src/language/stats/aggregate.c
@@ -182,7 +182,7 @@ cmd_aggregate (struct lexer *lexer, struct dataset *ds)
   lex_match (lexer, T_EQUALS);
   if (!lex_match (lexer, T_ASTERISK))
     {
-      out_file = fh_parse (lexer, FH_REF_FILE | FH_REF_SCRATCH);
+      out_file = fh_parse (lexer, FH_REF_FILE, dataset_session (ds));
       if (out_file == NULL)
         goto error;
     }
@@ -223,7 +223,7 @@ cmd_aggregate (struct lexer *lexer, struct dataset *ds)
 	  lex_match (lexer, T_EQUALS);
 	  if (!lex_match_id (lexer, "COLUMNWISE"))
 	    {
-	      lex_error (lexer, _("expecting %s"), "COLUMNWISE");
+	      lex_error_expecting (lexer, "COLUMNWISE", NULL);
               goto error;
 	    }
 	  agr.missing = COLUMNWISE;
@@ -638,8 +638,7 @@ parse_aggregate_functions (struct lexer *lexer, const struct dictionary *dict,
 
 	    free (dest[i]);
 	    if (dest_label[i])
-              var_set_label (destvar, dest_label[i],
-                             dict_get_encoding (agr->dict), true);
+              var_set_label (destvar, dest_label[i], true);
 
 	    v->dest = destvar;
 	  }