Changeset 1458 for trunk/src/kmk/expand.c

Timestamp:

Mar 31, 2008, 12:16:15 AM (17 years ago)

Author:

bird

Message:

Use the variable file location in evalval and evalcall.

File:

• trunk/src/kmk/expand.c (modified) (3 diffs)

trunk/src/kmk/expand.c

@@ -518 +518 @@
   char *result;
   struct variable_set_list *save;
+  const struct floc *reading_file_saved;
 
   if (file == 0)
@@ -524 +525 @@
   save = current_variable_set_list;
   current_variable_set_list = file->variables;
+  reading_file_saved = reading_file;
   if (file->cmds && file->cmds->fileinfo.filenm)
     reading_file = &file->cmds->fileinfo;
@@ -530 +532 @@
   result = variable_expand_string (o, line, (long)-1);
   current_variable_set_list = save;
-  reading_file = 0;
+  reading_file = reading_file_saved;
 
   return result;