diff options
| author | Miles Bader <miles@gnu.org> | 2008-01-30 08:29:16 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2008-01-30 08:29:16 +0000 |
| commit | 9fab8546840e884c123fdd57a4016a79ec8f7a3d (patch) | |
| tree | 231fcdf56bd421022636c11304db0f0423fd6ffc | |
| parent | d235ca2ff8fab139ce797757fcb159d1e28fa7e0 (diff) | |
| download | emacs-9fab8546840e884c123fdd57a4016a79ec8f7a3d.tar.gz | |
Fix merge mistake
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-325
| -rw-r--r-- | lisp/emacs-lisp/cl-loaddefs.el | 2 | ||||
| -rw-r--r-- | lisp/ps-print.el | 2 | ||||
| -rw-r--r-- | src/emacs.c | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/lisp/emacs-lisp/cl-loaddefs.el b/lisp/emacs-lisp/cl-loaddefs.el index 2297314af87..0ad27359cc2 100644 --- 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 6a44a6c5ef6..2579cc6ff13 100644 --- 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. ;;;### (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 839582a3bf3..50230b653d2 100644 --- 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 |