From: Leo Liu <sdl.web@gmail.com>
Date: Thu, 7 Jan 2016 03:00:52 +0000 (+0800)
Subject: Add defvar-local to lisp-imenu-generic-expression
X-Git-Tag: emacs-25.0.90~250
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ce4a052415b70030ee591af3cb5bed0fb79ef3aa;p=emacs.git

Add defvar-local to lisp-imenu-generic-expression

* lisp/emacs-lisp/lisp-mode.el (lisp-imenu-generic-expression): Add
  defvar-local.
---

diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el
index 574ecef0cde..cb8abde52ed 100644
--- a/lisp/emacs-lisp/lisp-mode.el
+++ b/lisp/emacs-lisp/lisp-mode.el
@@ -131,9 +131,10 @@
                               t))
 			   "\\s-+\\(" lisp-mode-symbol-regexp "\\)"))
 	 2)
-   ;; For `defvar', we ignore (defvar FOO) constructs.
+   ;; For `defvar'/`defvar-local', we ignore (defvar FOO) constructs.
    (list (purecopy "Variables")
-	 (purecopy (concat "^\\s-*(defvar\\s-+\\(" lisp-mode-symbol-regexp "\\)"
+	 (purecopy (concat "^\\s-*(defvar\\(?:-local\\)?\\s-+\\("
+                           lisp-mode-symbol-regexp "\\)"
 			   "[[:space:]\n]+[^)]"))
 	 1)
    (list (purecopy "Types")