summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp
diff options
context:
space:
mode:
authorChong Yidong <cyd@gnu.org>2012-08-05 22:14:54 +0800
committerChong Yidong <cyd@gnu.org>2012-08-05 22:14:54 +0800
commitb7ccbdc2e39ff834a03a7f30516b71cd98e84a44 (patch)
tree709716de67fb79a23bf4e78346dabf808b3310fb /lisp/emacs-lisp
parentd32e47aff6cc01e3ccdfdf5e8f163f8a52285a75 (diff)
downloademacs-b7ccbdc2e39ff834a03a7f30516b71cd98e84a44.tar.gz
emacs-b7ccbdc2e39ff834a03a7f30516b71cd98e84a44.tar.bz2
emacs-b7ccbdc2e39ff834a03a7f30516b71cd98e84a44.zip
In Imenu, don't show defvars with no second argument.
* lisp/emacs-lisp/lisp-mode.el (lisp-imenu-generic-expression): Don't show defvars which have no second argument. * lisp/imenu.el (imenu-generic-expression): Move documentation here from imenu--generic-function. (imenu--generic-function): Refer to imenu-generic-expression. Fixes: debbugs:8638
Diffstat (limited to 'lisp/emacs-lisp')
-rw-r--r--lisp/emacs-lisp/lisp-mode.el7
1 files changed, 6 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el
index e29407f5a8b..7e9dd9e6cfe 100644
--- a/lisp/emacs-lisp/lisp-mode.el
+++ b/lisp/emacs-lisp/lisp-mode.el
@@ -117,10 +117,15 @@ It has `lisp-mode-abbrev-table' as its parent."
(purecopy (concat "^\\s-*("
(eval-when-compile
(regexp-opt
- '("defvar" "defconst" "defconstant" "defcustom"
+ '("defconst" "defconstant" "defcustom"
"defparameter" "define-symbol-macro") t))
"\\s-+\\(\\(\\sw\\|\\s_\\)+\\)"))
2)
+ ;; For `defvar', we ignore (defvar FOO) constructs.
+ (list (purecopy "Variables")
+ (purecopy (concat "^\\s-*(defvar\\s-+\\(\\(\\sw\\|\\s_\\)+\\)"
+ "[[:space:]\n]+[^)]"))
+ 1)
(list (purecopy "Types")
(purecopy (concat "^\\s-*("
(eval-when-compile