avoid recursive `require' when loading semantic

[bpt/emacs.git] / src / emacs.c

diff --git a/src/emacs.c b/src/emacs.c
index 87a9bb7..319f5ef 100644 (file)
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -710,6 +710,9 @@ string_from_scheme (Lisp_Object scheme_string)
                                  nbytes);
 }
 
+Lisp_Object xsymbol_fn;
+Lisp_Object symbol_function_fn;
+
 static int main2 (void *, int, char **);
 
 int
@@ -1198,6 +1201,9 @@ Using an Emacs configured with --with-x-toolkit=lucid does not have this problem
                            "lisp-string?",
                            scm_c_make_gsubr ("stringp", 1, 0, 0, Fstringp));
 
+      xsymbol_fn = scm_c_public_ref ("language elisp runtime", "symbol-desc");
+      symbol_function_fn = scm_c_public_ref ("language elisp runtime", "symbol-function");
+
       init_guile ();
       init_fns_once ();
       init_obarray ();
@@ -1216,10 +1222,13 @@ Using an Emacs configured with --with-x-toolkit=lucid does not have this problem
          functions because it sets up symbols used by defsubr.  */
       syms_of_data ();
 
-      scm_call_4 (scm_c_public_ref ("language elisp runtime", "emacs!"),
+      scm_call_7 (scm_c_public_ref ("language elisp runtime", "emacs!"),
                   SYMBOL_FUNCTION (intern ("symbol-value")),
                   SYMBOL_FUNCTION (intern ("set")),
                   SYMBOL_FUNCTION (intern ("boundp")),
+                  SYMBOL_FUNCTION (intern ("default-value")),
+                  SYMBOL_FUNCTION (intern ("set-default")),
+                  SYMBOL_FUNCTION (intern ("default-boundp")),
                   SYMBOL_FUNCTION (intern ("bind-symbol")));
 
       /* Call syms_of_xfaces before init_window_once because that