(main): Don't call syms_of_data twice.

diff --git a/src/ChangeLog b/src/ChangeLog
index 123e7a845cdb37f0017be98a997bb4abeab52f1a..d9b4984b4d486ce42561f8ec5df16a8bc8659aa6 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2009-08-17  Ken Raeburn  <raeburn@raeburn.org>
+
+       * emacs.c (main): Don't call syms_of_data twice.
+
 2009-08-16  Michael Albinus  <michael.albinus@gmx.de>
 
        * dbusbind.c (xd_initialize): Add connection file descriptor to

diff --git a/src/emacs.c b/src/emacs.c
index 7e9373d305c6003e2f9a98b03aa9975abf0cf65b..657465da833ee5038b6933f0b1f6a329986aa0b5 100644 (file)
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -1630,10 +1630,8 @@ main (int argc, char **argv)
 
   if (!initialized)
     {
-      /* The basic levels of Lisp must come first.  */
-      /* And data must come first of all
-        for the sake of symbols like error-message.  */
-      syms_of_data ();
+      /* The basic levels of Lisp must come first.  Note that
+        syms_of_data and some others have already been called.  */
       syms_of_chartab ();
       syms_of_lread ();
       syms_of_print ();