(main): Don't call syms_of_data twice.

2 files changed, 6 insertions, 4 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 123e7a845cd..d9b4984b4d4 100644
--- 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 7e9373d305c..657465da833 100644
--- 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 ();