From 2388ae79c427738e68375f8ba12414981044aeec Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 29 Oct 2013 23:31:15 -0700 Subject: [PATCH] * lisp/cedet/semantic/grammar.el (semantic-grammar-mode-keywords-2) (semantic-grammar-mode-keywords-3): Handle renamed font-lock vars. --- lisp/cedet/ChangeLog | 16 ++++++++++------ lisp/cedet/semantic/grammar.el | 8 ++++++-- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/lisp/cedet/ChangeLog b/lisp/cedet/ChangeLog index c5f93d64710..22ad40eb644 100644 --- a/lisp/cedet/ChangeLog +++ b/lisp/cedet/ChangeLog @@ -1,14 +1,18 @@ +2013-10-30 Glenn Morris + + * semantic/grammar.el (semantic-grammar-mode-keywords-2) + (semantic-grammar-mode-keywords-3): Handle renamed font-lock vars. + 2013-10-20 Johan Bockgård - * 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 - * 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 diff --git a/lisp/cedet/semantic/grammar.el b/lisp/cedet/semantic/grammar.el index 60c4ccadf65..a545fcaee46 100644 --- 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 -- 2.39.2