Mercurial > emacs
changeset 59871:83af8894e534
(font-lock-default-function): Handle the rare case where
only font-lock-keywords is set.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Thu, 03 Feb 2005 04:28:21 +0000 |
| parents | d19236272855 |
| children | d7da3e10bfef |
| files | lisp/ChangeLog lisp/font-core.el |
| diffstat | 2 files changed, 10 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Thu Feb 03 03:56:00 2005 +0000 +++ b/lisp/ChangeLog Thu Feb 03 04:28:21 2005 +0000 @@ -1,6 +1,11 @@ +2005-02-02 Stefan Monnier <monnier@iro.umontreal.ca> + + * font-core.el (font-lock-default-function): Handle the rare case where + only font-lock-keywords is set. + 2005-02-03 Kenichi Handa <handa@m17n.org> - * international/characters.el: Cancel previous change. for + * international/characters.el: Cancel previous change for I-WITH-DOT-ABOVE and DOTLESS-i. * international/latin-5.el: Cancel previous change.
--- a/lisp/font-core.el Thu Feb 03 03:56:00 2005 +0000 +++ b/lisp/font-core.el Thu Feb 03 04:28:21 2005 +0000 @@ -1,7 +1,7 @@ ;;; font-core.el --- Core interface to font-lock -;; Copyright (C) 1992, 93, 94, 95, 96, 97, 98, 1999, 2000, 2001, 02, 2003 -;; Free Software Foundation, Inc. +;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, +;; 2002, 2003, 2005 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: languages, faces @@ -202,6 +202,7 @@ ;; Only do hard work if the mode has specified stuff in ;; `font-lock-defaults'. (when (or font-lock-defaults + (and (boundp 'font-lock-keywords) font-lock-keywords) (cdr (assq major-mode font-lock-defaults-alist))) (font-lock-mode-internal mode))) @@ -295,6 +296,5 @@ (provide 'font-core) +;; arch-tag: f8c286e1-02f7-41d9-b89b-1b67780aed71 ;;; font-core.el ends here - -;;; arch-tag: f8c286e1-02f7-41d9-b89b-1b67780aed71