--- a/src/variables.cc	Sun Aug 07 03:09:19 1994 +0000
+++ b/src/variables.cc	Sun Aug 07 04:40:03 1994 +0000
@@ -39,6 +39,8 @@
 #include "octave-hist.h"
 #include "unwind-prot.h"
 #include "user-prefs.h"
+#include "tree-base.h"
+#include "tree-expr.h"
 #include "tree-const.h"
 #include "variables.h"
 #include "statdefs.h"
@@ -56,7 +58,6 @@
 #include "defun.h"
 #include "input.h"
 #include "parse.h"
-#include "tree.h"
 #include "help.h"
 #include "lex.h"
 
@@ -1739,6 +1740,9 @@
   return retval;
 }
 
+// XXX FIXME XXX -- this should take a list of regular expressions
+// naming the variables to look for.
+
 static Octave_object
 do_who (int argc, char **argv, int nargout)
 {
@@ -1749,6 +1753,8 @@
   int show_variables = 1;
   int show_verbose = 0;
 
+  char *my_name = argv[0];
+
   if (argc > 1)
     {
       show_functions = 0;
@@ -1777,7 +1783,7 @@
 	       || strcmp (*argv, "-v") == 0)
 	show_variables++;
       else
-	warning ("who: unrecognized option `%s'", *argv);
+	warning ("%s: unrecognized option `%s'", my_name, *argv);
     }
 
 // If the user specified -l and nothing else, show variables.  If