* lisp/cedet/semantic/grammar.el (semantic-grammar-mode-keywords-2)

(semantic-grammar-mode-keywords-3): Handle renamed font-lock vars.

diff --git a/lisp/cedet/ChangeLog b/lisp/cedet/ChangeLog
index c5f93d64710564a669713f2cf0d08d0cf1191ea8..22ad40eb644afd32e2b207a83dd47d1ea2501ac9 100644 (file)
--- a/lisp/cedet/ChangeLog
+++ b/lisp/cedet/ChangeLog
@@ -1,14 +1,18 @@
+2013-10-30  Glenn Morris  <rgm@gnu.org>
+
+       * semantic/grammar.el (semantic-grammar-mode-keywords-2)
+       (semantic-grammar-mode-keywords-3): Handle renamed font-lock vars.
+
 2013-10-20  Johan Bockgård  <bojohan@gnu.org>
 
-       * semantic/db-mode.el (global-semanticdb-minor-mode): Remove hooks
-       correctly.
-       (semanticdb-toggle-global-mode): Pass `toggle' to minor mode
-       function.
+       * semantic/db-mode.el (global-semanticdb-minor-mode):
+       Remove hooks correctly.
+       (semanticdb-toggle-global-mode): Pass `toggle' to minor mode function.
 
 2013-09-28  Leo Liu  <sdl.web@gmail.com>
 
-       * semantic/texi.el (semantic-analyze-possible-completions): Use
-       ispell-lookup-words instead.  (Bug#15460)
+       * semantic/texi.el (semantic-analyze-possible-completions):
+       Use ispell-lookup-words instead.  (Bug#15460)
 
 2013-09-20  Glenn Morris  <rgm@gnu.org>
 

diff --git a/lisp/cedet/semantic/grammar.el b/lisp/cedet/semantic/grammar.el
index 60c4ccadf65d88f7b5ae73b53c118afb6d1112ab..a545fcaee46091c35dfb0644ef389e31bc10f911 100644 (file)
--- a/lisp/cedet/semantic/grammar.el
+++ b/lisp/cedet/semantic/grammar.el
@@ -1160,12 +1160,16 @@ END is the limit of the search."
 
 (defvar semantic-grammar-mode-keywords-2
   (append semantic-grammar-mode-keywords-1
-          lisp-font-lock-keywords-1)
+         (if (boundp 'lisp-font-lock-keywords-1)
+             lisp-font-lock-keywords-1
+           lisp-el-font-lock-keywords-1))
   "Font Lock keywords used to highlight Semantic grammar buffers.")
 
 (defvar semantic-grammar-mode-keywords-3
   (append semantic-grammar-mode-keywords-1
-          lisp-font-lock-keywords-2)
+         (if (boundp 'lisp-font-lock-keywords-2)
+             lisp-font-lock-keywords-2
+           lisp-el-font-lock-keywords-2))
   "Font Lock keywords used to highlight Semantic grammar buffers.")
 
 (defvar semantic-grammar-mode-keywords