[Emacs-diffs] /srv/bzr/emacs/trunk r111796: * lisp/font-lock.el (lisp-font-lock-keywords-1): Add defvar-local.

[Glenn Morris]

------------------------------------------------------------
revno: 111796
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Fri 2013-02-15 20:55:31 -0500
message:
  * lisp/font-lock.el (lisp-font-lock-keywords-1): Add defvar-local.
modified:
  lisp/ChangeLog
  lisp/font-lock.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-02-15 23:47:50 +0000
+++ b/lisp/ChangeLog    2013-02-16 01:55:31 +0000
@@ -1,3 +1,7 @@
+2013-02-16  Glenn Morris  <address@hidden>
+
+       * font-lock.el (lisp-font-lock-keywords-1): Add defvar-local.
+
 2013-02-15  Stefan Monnier  <address@hidden>
 
        * 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  <address@hidden>
+2013-02-15  Glenn Morris  <address@hidden>
 
        * emacs-lisp/easy-mmode.el (define-minor-mode): Doc fix.
 

=== modified file 'lisp/font-lock.el'
--- a/lisp/font-lock.el 2013-01-11 23:08:55 +0000
+++ b/lisp/font-lock.el 2013-02-16 01:55:31 +0000
@@ -2256,7 +2256,7 @@
                "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\\)"
                "\\)\\)\\>"