Fix hi-lock-mode interactions with font-lock.
commitc58059f23e10ebb3088986f1b310a80a603df20a
authorDavid Koppelman <koppel@ece.lsu.edu>
Sat, 9 Oct 2010 04:09:19 +0000 (9 00:09 -0400)
committerChong Yidong <cyd@stupidchicken.com>
Sat, 9 Oct 2010 04:09:19 +0000 (9 00:09 -0400)
tree78ac4a7eddfed843e1f6f0996cff8f9842933ed4
parentd15f9a2b499f937d1e962c5dfcebb2024f82de86
Fix hi-lock-mode interactions with font-lock.
* hi-lock.el (hi-lock-font-lock-hook): Check font-lock-fontified
instead of font-lock-mode before adding keywords. Removed
hi-lock-mode off code. Removed inhibit hack.
(hi-lock-set-pattern): Only add keywords if font-lock-fontified
non-nil; removed hook inhibit hack.
lisp/ChangeLog
lisp/hi-lock.el