--- a/src/symtab.h	Sat May 06 14:55:35 2006 +0000
+++ b/src/symtab.h	Mon May 08 20:23:07 2006 +0000
@@ -74,8 +74,7 @@
       BUILTIN_FUNCTION = 8,
       COMMAND = 16,
       RAWCOMMAND = 32,
-      MAPPER_FUNCTION = 64,
-      BUILTIN_VARIABLE = 128
+      MAPPER_FUNCTION = 64
     };
 
 private:
@@ -94,10 +93,7 @@
     ~symbol_def (void) { }
 
     bool is_variable (void) const
-      {
-	return (symbol_type & symbol_record::USER_VARIABLE
-		|| symbol_type & symbol_record::BUILTIN_VARIABLE);
-      }
+      { return (symbol_type & symbol_record::USER_VARIABLE); }
 
     // It's not necessary to check for COMMAND and MAPPER_FUNCTION
     // here.  Those tags are just used as additional qualifiers for
@@ -139,9 +135,6 @@
     bool is_user_function (void) const
       { return (symbol_type & symbol_record::USER_FUNCTION); }
 
-    bool is_builtin_variable (void) const
-      { return (symbol_type & symbol_record::BUILTIN_VARIABLE); }
-
     bool is_builtin_function (void) const
       { return (symbol_type & symbol_record::BUILTIN_FUNCTION); }
 
@@ -330,9 +323,6 @@
   bool is_user_variable (void) const
     { return definition->is_user_variable (); }
 
-  bool is_builtin_variable (void) const
-    { return definition->is_builtin_variable (); }
-
   bool is_map_element (const std::string& elts) const
     { return definition->is_map_element (elts); }
 
@@ -358,8 +348,6 @@
 
   void define (const octave_value& v, unsigned int sym_type = USER_VARIABLE);
 
-  void define_builtin_var (const octave_value& v);
-
   bool define (octave_function *f, unsigned int sym_type);
 
   void document (const std::string& h) { definition->document (h); }
@@ -467,8 +455,6 @@
 
   bool read_only_error (const char *action);
 
-  void link_to_builtin_variable (void);
-
   void maybe_delete_def (void)
     {
       if (--definition->count <= 0)
@@ -495,11 +481,9 @@
 			  | symbol_record::BUILTIN_FUNCTION \
 			  | symbol_record::COMMAND \
   			  | symbol_record::RAWCOMMAND \
-			  | symbol_record::MAPPER_FUNCTION \
-			  | symbol_record::BUILTIN_VARIABLE)
+			  | symbol_record::MAPPER_FUNCTION)
 
-#define SYMTAB_VARIABLES (symbol_record::USER_VARIABLE \
-			  | symbol_record::BUILTIN_VARIABLE)
+#define SYMTAB_VARIABLES (symbol_record::USER_VARIABLE)
 
 class
 symbol_table