diff lisp/font-lock.el @ 83565:41aaac7180d5

Merged from [e-mail] Patches applied: * [e-mail]/emacs--devo--0--patch-708 Update from CVS * [e-mail]/emacs--devo--0--patch-709 Update from CVS * [e-mail]/emacs--devo--0--patch-710 Update from CVS * [e-mail]/emacs--devo--0--patch-711 Update from CVS * [e-mail]/emacs--devo--0--patch-712 Update from CVS * [e-mail]/emacs--devo--0--patch-713 Update from CVS * [e-mail]/emacs--devo--0--patch-714 Update from CVS * [e-mail]/emacs--devo--0--patch-715 Update from CVS * [e-mail]/emacs--devo--0--patch-716 Merge from emacs--rel--22 * [e-mail]/emacs--devo--0--patch-717 Update from CVS * [e-mail]/emacs--devo--0--patch-718 Update from CVS * [e-mail]/emacs--devo--0--patch-719 Merge from emacs--rel--22 * [e-mail]/emacs--devo--0--patch-720 Update from CVS * [e-mail]/emacs--devo--0--patch-721 Update from CVS * [e-mail]/emacs--devo--0--patch-722 Update from CVS * [e-mail]/emacs--devo--0--patch-723 Merge from emacs--rel--22: lisp/dired-x.el: Revert 2007-04-06 change. * [e-mail]/emacs--devo--0--patch-724 Update from CVS * [e-mail]/emacs--devo--0--patch-725 Merge from gnus--rel--5.10 * [e-mail]/emacs--devo--0--patch-726 Update from CVS * [e-mail]/emacs--devo--0--patch-727 Merge from emacs--rel--22 * [e-mail]/emacs--devo--0--patch-728 Update from CVS * [e-mail]/emacs--devo--0--patch-729 Merge from emacs--rel--22 * [e-mail]/emacs--devo--0--patch-730 Update from CVS * [e-mail]/emacs--devo--0--patch-731 Merge from emacs--rel--22 * [e-mail]/emacs--devo--0--patch-732 Update from CVS * [e-mail]/emacs--devo--0--patch-733 Update from CVS * [e-mail]/emacs--devo--0--patch-734 Merge from emacs--rel--22 * [e-mail]/emacs--devo--0--patch-735 Update from CVS * [e-mail]/emacs--devo--0--patch-736 Merge from emacs--rel--22 * [e-mail]/emacs--devo--0--patch-737 Update from CVS * [e-mail]/emacs--devo--0--patch-738 Update from CVS * [e-mail]/emacs--devo--0--patch-739 Merge from emacs--rel--22 * [e-mail]/emacs--devo--0--patch-740 Update from CVS * [e-mail]/emacs--devo--0--patch-741 Merge from gnus--rel--5.10 * [e-mail]/emacs--devo--0--patch-742 Update from CVS * [e-mail]/emacs--devo--0--patch-743 Merge from emacs--rel--22 * [e-mail]/emacs--rel--22--base-0 tag of [e-mail]/emacs--devo--0--patch-709 * [e-mail]/emacs--rel--22--patch-1 Sync to CVS tag EMACS_22_BRANCHPOINT * [e-mail]/emacs--rel--22--patch-2 Sync to CVS branch EMACS_22_BASE * [e-mail]/emacs--rel--22--patch-3 Update from CVS * [e-mail]/emacs--rel--22--patch-4 Update from CVS * [e-mail]/emacs--rel--22--patch-5 Update from CVS * [e-mail]/emacs--rel--22--patch-6 Update from CVS * [e-mail]/emacs--rel--22--patch-7 Update from CVS * [e-mail]/emacs--rel--22--patch-8 Update from CVS * [e-mail]/emacs--rel--22--patch-9 Update from CVS * [e-mail]/emacs--rel--22--patch-10 Update from CVS * [e-mail]/emacs--rel--22--patch-11 Update from CVS * [e-mail]/emacs--rel--22--patch-12 Update from CVS * [e-mail]/emacs--rel--22--patch-13 Update from CVS * [e-mail]/gnus--rel--5.10--patch-217 Update from CVS * [e-mail]/gnus--rel--5.10--patch-218 Merge from emacs--devo--0, emacs--rel--22 * [e-mail]/gnus--rel--5.10--patch-219 Update from CVS * [e-mail]/gnus--rel--5.10--patch-220 Update from CVS git-archimport-id: [e-mail]--2004/emacs--multi-tty--0--patch-605

--- a/lisp/font-lock.el	Sun Apr 22 13:47:56 2007 +0000
+++ b/lisp/font-lock.el	Fri May 11 18:24:42 2007 +0000
@@ -468,6 +468,7 @@
 
 This is normally set via `font-lock-add-keywords' and
 `font-lock-remove-keywords'.")
+(put 'font-lock-keywords-alist 'risky-local-variable t)
 
 (defvar font-lock-removed-keywords-alist nil
   "Alist of `font-lock-keywords' elements to be removed for major modes.