Mercurial > emacs
diff lisp/ChangeLog.10 @ 90260:0ca0d9181b5e
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-95
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 598-615)
- Update from CVS
- Remove lisp/toolbar directory
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 142-146)
- Update from CVS
author | Miles Bader <miles@gnu.org> |
---|---|
date | Mon, 16 Jan 2006 06:59:21 +0000 |
parents | 3ebd9bdb4fe5 c0c200bc0fa1 |
children | 5b7d410e31f9 |
line wrap: on
line diff
--- a/lisp/ChangeLog.10 Wed Dec 28 07:22:57 2005 +0000 +++ b/lisp/ChangeLog.10 Mon Jan 16 06:59:21 2006 +0000 @@ -14639,7 +14639,7 @@ * font-lock.el (font-lock-defaults, font-lock-defaults-alist) (font-lock-multiline, font-lock-fontified, font-lock-mode) (turn-on-font-lock, font-lock-add-keywords, global-font-lock-mode) - (font-lock-global-modes): Moved to font-core.el. + (font-lock-global-modes): Move to font-core.el. (font-lock-set-defaults-1): Partially moved to font-core.el. * font-core.el: New file, with functions taken from font-lock.el.