[Emacs-diffs] trunk r114862: * lisp/cedet/semantic/grammar.el (semantic-grammar-mode-keywords-2)

[Glenn Morris]

------------------------------------------------------------
revno: 114862
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2013-10-29 23:31:15 -0700
message:
  * lisp/cedet/semantic/grammar.el (semantic-grammar-mode-keywords-2)
  (semantic-grammar-mode-keywords-3): Handle renamed font-lock vars.
modified:
  lisp/cedet/ChangeLog           changelog-20100919015713-3rbr456yray5m84f-1
  lisp/cedet/semantic/grammar.el 
grammar.el-20091113204419-o5vbwnq5f7feedwu-11281

=== modified file 'lisp/cedet/ChangeLog'
--- a/lisp/cedet/ChangeLog      2013-10-20 09:51:21 +0000
+++ b/lisp/cedet/ChangeLog      2013-10-30 06:31:15 +0000
@@ -1,14 +1,18 @@
+2013-10-30  Glenn Morris  <address@hidden>
+
+       * semantic/grammar.el (semantic-grammar-mode-keywords-2)
+       (semantic-grammar-mode-keywords-3): Handle renamed font-lock vars.
+
 2013-10-20  Johan Bockgård  <address@hidden>
 
-       * 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  <address@hidden>
 
-       * 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  <address@hidden>
 

=== modified file 'lisp/cedet/semantic/grammar.el'
--- a/lisp/cedet/semantic/grammar.el    2013-09-11 03:31:56 +0000
+++ b/lisp/cedet/semantic/grammar.el    2013-10-30 06:31:15 +0000
@@ -1160,12 +1160,16 @@
 
 (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