Image consolidation:

(main) [HAVE_WINDOW_SYSTEM]: Add calls to syms_of_image
and init_image.  Remove call to init_xfns.

diff --git a/src/emacs.c b/src/emacs.c
index 66a2af72fb5f8a74473301843bfdadda5c52bd3d..abd0489caad31fe9e1ff49d7a1354838b6afe2a8 100644 (file)
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -1511,6 +1511,7 @@ main (argc, argv
       syms_of_xdisp ();
 #ifdef HAVE_WINDOW_SYSTEM
       syms_of_fringe ();
+      syms_of_image ();
 #endif /* HAVE_WINDOW_SYSTEM */
 #ifdef HAVE_X_WINDOWS
       syms_of_xterm ();
@@ -1589,13 +1590,11 @@ main (argc, argv
   init_vmsproc ();     /* And this too.  */
 #endif /* VMS */
   init_sys_modes ();   /* Init system terminal modes (RAW or CBREAK, etc.).  */
-#if defined (HAVE_X_WINDOWS) || defined (WINDOWSNT) || defined (HAVE_CARBON)
-  init_xfns ();
-#endif /* HAVE_X_WINDOWS */
   init_fns ();
   init_xdisp ();
 #ifdef HAVE_WINDOW_SYSTEM
   init_fringe ();
+  init_image ();
 #endif /* HAVE_WINDOW_SYSTEM */
   init_macros ();
   init_editfns ();