aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMiles Bader2008-01-30 08:29:16 +0000
committerMiles Bader2008-01-30 08:29:16 +0000
commit9fab8546840e884c123fdd57a4016a79ec8f7a3d (patch)
tree231fcdf56bd421022636c11304db0f0423fd6ffc /src
parentd235ca2ff8fab139ce797757fcb159d1e28fa7e0 (diff)
downloademacs-9fab8546840e884c123fdd57a4016a79ec8f7a3d.tar.gz
emacs-9fab8546840e884c123fdd57a4016a79ec8f7a3d.zip
Fix merge mistake
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-325
Diffstat (limited to 'src')
-rw-r--r--src/emacs.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/emacs.c b/src/emacs.c
index 839582a3bf3..50230b653d2 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -1559,7 +1559,6 @@ main (argc, argv
1559 for the sake of symbols like error-message. */ 1559 for the sake of symbols like error-message. */
1560 /* Called before init_window_once for Mac OS Classic. */ 1560 /* Called before init_window_once for Mac OS Classic. */
1561 syms_of_data (); 1561 syms_of_data ();
1562#endif
1563 syms_of_chartab (); 1562 syms_of_chartab ();
1564 syms_of_lread (); 1563 syms_of_lread ();
1565 syms_of_print (); 1564 syms_of_print ();
@@ -1575,7 +1574,6 @@ main (argc, argv
1575 syms_of_callproc (); 1574 syms_of_callproc ();
1576 syms_of_category (); 1575 syms_of_category ();
1577 syms_of_ccl (); 1576 syms_of_ccl ();
1578#endif
1579 syms_of_character (); 1577 syms_of_character ();
1580 syms_of_cmds (); 1578 syms_of_cmds ();
1581#ifndef NO_DIR_LIBRARY 1579#ifndef NO_DIR_LIBRARY