Mercurial > emacs
changeset 91368:928f0831d88b
Fix merge mistake
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-325
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Wed, 30 Jan 2008 08:29:16 +0000 |
| parents | c70e45a7acfd |
| children | 4c4c06eecf22 |
| files | lisp/emacs-lisp/cl-loaddefs.el lisp/ps-print.el src/emacs.c |
| diffstat | 3 files changed, 2 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/emacs-lisp/cl-loaddefs.el Wed Jan 30 07:57:28 2008 +0000 +++ b/lisp/emacs-lisp/cl-loaddefs.el Wed Jan 30 08:29:16 2008 +0000 @@ -283,7 +283,7 @@ ;;;;;; 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" "\
--- a/lisp/ps-print.el Wed Jan 30 07:57:28 2008 +0000 +++ b/lisp/ps-print.el Wed Jan 30 08:29:16 2008 +0000 @@ -6617,7 +6617,7 @@ ;; 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 "\
--- a/src/emacs.c Wed Jan 30 07:57:28 2008 +0000 +++ b/src/emacs.c Wed Jan 30 08:29:16 2008 +0000 @@ -1559,7 +1559,6 @@ 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 @@ syms_of_callproc (); syms_of_category (); syms_of_ccl (); -#endif syms_of_character (); syms_of_cmds (); #ifndef NO_DIR_LIBRARY