(font-lock-add-keywords): In case font-lock was only

half-activated, forcefully activate it completely.

2 files changed, 13 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f5b63f37570..41c902b9a86 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2007-06-11  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * font-lock.el (font-lock-add-keywords): In case font-lock was only
+        half-activated, forcefully activate it completely.
+
 2007-06-11  Richard Stallman  <rms@gnu.org>
 
         * cus-edit.el (custom-variable-type): Doc fix.
diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index c826a5f20c6..265cc4bf682 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -698,6 +698,14 @@ see the variables `c-font-lock-extra-types', `c++-font-lock-extra-types',
          ;; contain the new keywords.
          (font-lock-update-removed-keyword-alist mode keywords how))
         (t
+         (when (and font-lock-mode
+                    (not (or font-lock-keywords font-lock-defaults)))
+           ;; The major mode has not set any keywords, so when we enabled
+           ;; font-lock-mode it only enabled the font-core.el part, not the
+           ;; font-lock-mode-internal.  Try again.
+           (font-lock-mode -1)
+           (set (make-local-variable 'font-lock-defaults) '(nil t))
+           (font-lock-mode 1))
          ;; Otherwise set or add the keywords now.
          ;; This is a no-op if it has been done already in this buffer
          ;; for the correct major mode.