changeset 104312:c8e168f901e7

(main): Don't call syms_of_data twice.
author Ken Raeburn <raeburn@raeburn.org>
date Mon, 17 Aug 2009 00:48:14 +0000
parents bf7a2419d30f
children 73f76307d49b
files src/ChangeLog src/emacs.c
diffstat 2 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Sun Aug 16 23:20:21 2009 +0000
+++ b/src/ChangeLog	Mon Aug 17 00:48:14 2009 +0000
@@ -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
--- a/src/emacs.c	Sun Aug 16 23:20:21 2009 +0000
+++ b/src/emacs.c	Mon Aug 17 00:48:14 2009 +0000
@@ -1630,10 +1630,8 @@
 
   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 ();