Mercurial > emacs
comparison lisp/loadup.el @ 83676:27d11c1d4e46
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 857-862)
- Update from CVS
- Merge from emacs--rel--22
- Update from CVS: lisp/emacs-lisp/avl-tree.el: New file.
* emacs--rel--22 (patch 97-100)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 246-247)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-38
author | Miles Bader <miles@gnu.org> |
---|---|
date | Mon, 27 Aug 2007 09:21:49 +0000 |
parents | 5c783b868a56 80c2f32c0201 |
children | 56c1fcec9e61 |
comparison
equal
deleted
inserted
replaced
83675:67601f702028 | 83676:27d11c1d4e46 |
---|---|
80 (message "%s" (garbage-collect)) | 80 (message "%s" (garbage-collect)) |
81 (load "loaddefs.el") ;Don't get confused if someone compiled this by mistake. | 81 (load "loaddefs.el") ;Don't get confused if someone compiled this by mistake. |
82 (message "%s" (garbage-collect)) | 82 (message "%s" (garbage-collect)) |
83 (load "simple") | 83 (load "simple") |
84 | 84 |
85 (load "button") | |
85 (load "help") | 86 (load "help") |
86 | 87 |
87 (load "jka-cmpr-hook") | 88 (load "jka-cmpr-hook") |
88 ;; Any Emacs Lisp source file (*.el) loaded here after can contain | 89 ;; Any Emacs Lisp source file (*.el) loaded here after can contain |
89 ;; multilingual text. | 90 ;; multilingual text. |