* lisp/font-lock.el (lisp-font-lock-keywords-1): Add defvar-local.

2 files changed, 6 insertions, 4 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 064ad686fca..09645ec4741 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2013-02-16  Glenn Morris  <rgm@gnu.org>
+
+        * font-lock.el (lisp-font-lock-keywords-1): Add defvar-local.
+
 2013-02-15  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * simple.el (eval-expression): Let `exp' set the mark (bug#13724).
@@ -15,15 +19,13 @@
 
         * iswitchb.el (iswitchb-read-buffer): Bind `C-.' and `C-,' to
         `iswitchb-next-match' and `iswitchb-prev-match' resply.
-
         * ido.el (ido-init-completion-maps): Bind `C-.' and `C-,' to
         `ido-next-match' and `ido-prev-match' resply.
-
         * icomplete.el (icomplete-minibuffer-map): Unbind `C-s' and `C-r'.
         Bind `C-.' and `C-,' to `icomplete-forward-completions' and
         `icomplete-backward-completions' (Bug#13708).
 
-2013-02-15  Michael Albinus  <michael.albinus@gmx.de>
+2013-02-15  Glenn Morris  <rgm@gnu.org>
 
         * emacs-lisp/easy-mmode.el (define-minor-mode): Doc fix.
 
diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index f714eaab233..6e3476ac9a5 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -2256,7 +2256,7 @@ in which C preprocessor directives are used. e.g. `asm-mode' and
                 "method-combination\\|setf-expander\\|skeleton\\|widget\\|"
                 "function\\|\\(compiler\\|modify\\|symbol\\)-macro\\)\\)\\|"
                 ;; Variable declarations.
-                "\\(const\\(ant\\)?\\|custom\\|varalias\\|face\\|parameter\\|var\\)\\|"
+                "\\(const\\(ant\\)?\\|custom\\|varalias\\|face\\|parameter\\|var\\(?:-local\\)?\\)\\|"
                 ;; Structure declarations.
                 "\\(class\\|group\\|theme\\|package\\|struct\\|type\\)"
                 "\\)\\)\\>"