update.

[chise/xemacs-chise.git.1] / src / emacs.c

diff --git a/src/emacs.c b/src/emacs.c
index 2331bb9..4011db7 100644 (file)
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -3,7 +3,7 @@
    Free Software Foundation, Inc.
    Copyright (C) 1995 Sun Microsystems, Inc.
    Copyright (C) 2000, 2002 Ben Wing.
    Free Software Foundation, Inc.
    Copyright (C) 1995 Sun Microsystems, Inc.
    Copyright (C) 2000, 2002 Ben Wing.

-   Copyright (C) 2000,2002 MORIOKA Tomohiko.
+   Copyright (C) 2000,2002,2005,2006,2010 MORIOKA Tomohiko.

 
 This file is part of XEmacs.
 
 
 This file is part of XEmacs.
 

@@ -1589,6 +1589,10 @@ main_1 (int argc, char **argv, char **envp, int restart)
       syms_of_postgresql ();
 #endif
 
       syms_of_postgresql ();
 #endif
 

+#ifdef HAVE_CONCORD
+      syms_of_concord ();
+#endif
+

       /* Now create the subtypes for the types that have them.
         We do this before the vars_*() because more symbols
         may get initialized here. */
       /* Now create the subtypes for the types that have them.
         We do this before the vars_*() because more symbols
         may get initialized here. */

@@ -1715,6 +1719,9 @@ main_1 (int argc, char **argv, char **envp, int restart)
       structure_type_create_faces ();
       structure_type_create_rangetab ();
       structure_type_create_hash_table ();
       structure_type_create_faces ();
       structure_type_create_rangetab ();
       structure_type_create_hash_table ();

+#ifdef HAVE_CONCORD
+      structure_type_create_concord ();
+#endif

 
       /* Now initialize the image instantiator formats and associated symbols.
          Other than the first function below, the functions may
 
       /* Now initialize the image instantiator formats and associated symbols.
          Other than the first function below, the functions may

@@ -2044,6 +2051,10 @@ main_1 (int argc, char **argv, char **envp, int restart)
       vars_of_postgresql();
 #endif
 
       vars_of_postgresql();
 #endif
 

+#ifdef HAVE_CONCORD
+      vars_of_concord ();
+#endif
+

 #ifdef HAVE_GPM
       vars_of_gpmevent ();
 #endif
 #ifdef HAVE_GPM
       vars_of_gpmevent ();
 #endif

@@ -2176,6 +2187,11 @@ main_1 (int argc, char **argv, char **envp, int restart)
       /* Calls make_lisp_hash_table() and creates a keymap */
       complex_vars_of_event_stream ();
 
       /* Calls make_lisp_hash_table() and creates a keymap */
       complex_vars_of_event_stream ();
 

+      /* This initializes data-sources of built-in genres */
+#ifdef HAVE_CONCORD
+      complex_vars_of_concord ();
+#endif
+

 #ifdef ERROR_CHECK_GC
       {
        extern int always_gc;
 #ifdef ERROR_CHECK_GC
       {
        extern int always_gc;

@@ -2218,6 +2234,9 @@ main_1 (int argc, char **argv, char **envp, int restart)
       structure_type_create_faces ();
       structure_type_create_rangetab ();
       structure_type_create_hash_table ();
       structure_type_create_faces ();
       structure_type_create_rangetab ();
       structure_type_create_hash_table ();

+#ifdef HAVE_CONCORD
+      structure_type_create_concord ();
+#endif

 
       lstream_type_create ();
 #ifdef FILE_CODING
 
       lstream_type_create ();
 #ifdef FILE_CODING

@@ -3072,7 +3091,7 @@ shut_down_emacs (int sig, Lisp_Object stuff, int no_auto_save)
 #else
         "Please report this bug by invoking M-x report-emacs-bug,\n"
         "or by selecting `Send Bug Report' from the Help menu.  If necessary, send\n"
 #else
         "Please report this bug by invoking M-x report-emacs-bug,\n"
         "or by selecting `Send Bug Report' from the Help menu.  If necessary, send\n"

-        "ordinary email to `crashes@xemacs.org'.  *MAKE SURE* to include the XEmacs\n"
+        "ordinary email to `xemacs-beta@xemacs.org'.  *MAKE SURE* to include the XEmacs\n"

         "configuration from M-x describe-installation, or equivalently the file\n"
         "Installation in the top of the build tree.\n"
 #endif
         "configuration from M-x describe-installation, or equivalently the file\n"
         "Installation in the top of the build tree.\n"
 #endif