Fix eval bugs 1516 and 1517.

1 files changed, 10 insertions, 0 deletions

diff --git a/function.c b/function.c
index 3282cdfc..5a27406b 100644
--- a/function.c
+++ b/function.c
@@ -1196,8 +1196,18 @@ func_wildcard (char *o, char **argv, const char *funcname)
 static char *
 func_eval (char *o, char **argv, const char *funcname)
 {
+  char *buf;
+  unsigned int len;
+
+  /* Eval the buffer.  Pop the current variable buffer setting so that the
+     eval'd code can use its own without conflicting.  */
+
+  install_variable_buffer (&buf, &len);
+
   eval_buffer (argv[0]);
 
+  restore_variable_buffer (buf, len);
+
   return o;
 }