Mercurial > emacs
comparison lisp/loadup.el @ 90159:08185296b491
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-44
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 272-288)
- src/xdisp.c (dump_glyph_row): Don't display overlay_arrow_p field.
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 67)
- Update from CVS
author | Miles Bader <miles@gnu.org> |
---|---|
date | Thu, 05 May 2005 00:04:55 +0000 |
parents | e1fbb019c538 8d917e74f135 |
children | 4a8b8c6bfa9b |
comparison
equal
deleted
inserted
replaced
90158:bf4846baba9a | 90159:08185296b491 |
---|---|
177 (progn ; floating pt. functions if we have float support. | 177 (progn ; floating pt. functions if we have float support. |
178 (load "emacs-lisp/float-sup"))) | 178 (load "emacs-lisp/float-sup"))) |
179 (message "%s" (garbage-collect)) | 179 (message "%s" (garbage-collect)) |
180 | 180 |
181 (load "vc-hooks") | 181 (load "vc-hooks") |
182 (load "jka-comp-hook") | |
182 (load "ediff-hook") | 183 (load "ediff-hook") |
183 (if (fboundp 'x-show-tip) (load "tooltip")) | 184 (if (fboundp 'x-show-tip) (load "tooltip")) |
184 (message "%s" (garbage-collect)) | 185 (message "%s" (garbage-collect)) |
185 | 186 |
186 ;If you want additional libraries to be preloaded and their | 187 ;If you want additional libraries to be preloaded and their |