Fix merge mistake

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-325

diff --git a/lisp/emacs-lisp/cl-loaddefs.el b/lisp/emacs-lisp/cl-loaddefs.el
index 2297314..0ad2735 100644 (file)
--- a/lisp/emacs-lisp/cl-loaddefs.el
+++ b/lisp/emacs-lisp/cl-loaddefs.el
@@ -283,7 +283,7 @@ Not documented
 ;;;;;;  do* do loop return-from return block etypecase typecase ecase
 ;;;;;;  case load-time-value eval-when destructuring-bind function*
 ;;;;;;  defmacro* defun* gentemp gensym cl-compile-time-init) "cl-macs"
-;;;;;;  "cl-macs.el" "24c5d69dcac117dea68e32a91fec9f67")
+;;;;;;  "cl-macs.el" "08184742d0cc2db17ac5a2b1e4823323")
 ;;; Generated autoloads from cl-macs.el
 
 (autoload 'cl-compile-time-init "cl-macs" "\

diff --git a/lisp/ps-print.el b/lisp/ps-print.el
index 6a44a6c..2579cc6 100644 (file)
--- a/lisp/ps-print.el
+++ b/lisp/ps-print.el
@@ -6617,7 +6617,7 @@ If FACE is not a valid face name, use default face."
 ;; But autoload them here to make the separation invisible.
 \f
 ;;;### (autoloads (ps-mule-end-job ps-mule-begin-job ps-mule-initialize
-;;;;;;  ps-multibyte-buffer) "ps-mule" "ps-mule.el" "ba0ba38bf1f9831ca12701290fd4b211")
+;;;;;;  ps-multibyte-buffer) "ps-mule" "ps-mule.el" "54fab899bd8999dd0aeca2c6357d24ca")
 ;;; Generated autoloads from ps-mule.el
 
 (defvar ps-multibyte-buffer nil "\

diff --git a/src/emacs.c b/src/emacs.c
index 839582a..50230b6 100644 (file)
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -1559,7 +1559,6 @@ main (argc, argv
         for the sake of symbols like error-message.  */
       /* Called before init_window_once for Mac OS Classic.  */
       syms_of_data ();
-#endif
       syms_of_chartab ();
       syms_of_lread ();
       syms_of_print ();
@@ -1575,7 +1574,6 @@ main (argc, argv
       syms_of_callproc ();
       syms_of_category ();
       syms_of_ccl ();
-#endif
       syms_of_character ();
       syms_of_cmds ();
 #ifndef NO_DIR_LIBRARY