diff options
| author | Karoly Lorentey <lorentey@elte.hu> | 2005-12-03 14:25:50 +0000 |
|---|---|---|
| committer | Karoly Lorentey <lorentey@elte.hu> | 2005-12-03 14:25:50 +0000 |
| commit | c8096f654b4f97be5ae45f2b95e8b20424a4265f (patch) | |
| tree | ec8410119f665ec82d94a0be76b8c9c09752c49f /lisp/loadup.el | |
| parent | 103fc5e102ae142b1fc20b53cbefd3e1cf99fa2e (diff) | |
| parent | da75982efdf0b03fd769a01fb9d645a1700d3599 (diff) | |
| download | emacs-c8096f654b4f97be5ae45f2b95e8b20424a4265f.tar.gz | |
Merged from miles@gnu.org--gnu-2005 (patch 659-663)
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-659
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-660
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-661
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-662
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-663
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-445
Diffstat (limited to 'lisp/loadup.el')
| -rw-r--r-- | lisp/loadup.el | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/loadup.el b/lisp/loadup.el index 370eeb8aa30..a8e23c41db7 100644 --- a/lisp/loadup.el +++ b/lisp/loadup.el @@ -134,11 +134,13 @@ (load "frame") (load "term/tty-colors") (load "font-core") +;; facemenu must be loaded before font-lock, because `facemenu-keymap' +;; needs to be defined when font-lock is loaded. +(load "facemenu") (load "emacs-lisp/syntax") (load "font-lock") (load "jit-lock") -(load "facemenu") (if (fboundp 'track-mouse) (progn (load "mouse") |