;;; semantic/imenu.el --- Use Semantic as an imenu tag generator
-;;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008, 2010
-;; Free Software Foundation, Inc.
+;; Copyright (C) 2000-2005, 2007-2008, 2010-2015 Free Software
+;; Foundation, Inc.
;; Author: Eric M. Ludlam <zappo@gnu.org>
;; Maintainer: Eric Ludlam
(defcustom semantic-imenu-bucketize-type-members t
"*Non-nil if members of a type should be grouped into buckets.
-nil means to keep them in the same order.
-Overriden to nil if `semantic-imenu-bucketize-file' is nil."
+A nil value means to keep them in the same order.
+Overridden to nil if `semantic-imenu-bucketize-file' is nil."
:group 'semantic-imenu
:type 'boolean)
-(make-variable-buffer-local 'semantic-imenu-bucketize-type-parts)
+(make-variable-buffer-local 'semantic-imenu-bucketize-type-members)
(semantic-varalias-obsolete 'semantic-imenu-bucketize-type-parts
'semantic-imenu-bucketize-type-members "23.2")
(defun semantic-imenu-goto-function (name position &optional rest)
"Move point associated with NAME to POSITION.
-Used to override function `imenu-default-goto-function' so that we can continue
-to use overlays to maintain the current position.
+Used to override function `imenu-default-goto-function' so that
+we can continue to use overlays to maintain the current position.
Optional argument REST is some extra stuff."
(require 'pulse)
(if (semantic-overlay-p position)
(setq imenu-default-goto-function 'semantic-imenu-goto-function)
(prog1
(if (and semantic-imenu-index-directory
- (featurep 'semanticdb)
+ (featurep 'semantic/db)
(semanticdb-minor-mode-p))
(semantic-create-imenu-directory-index
(or stream (semantic-fetch-tags-fast)))
'semantic-imenu-flush-fcn nil t)))
(defun semantic-create-imenu-directory-index (&optional stream)
- "Create an IMENU tag index based on all files active in semanticdb.
+ "Create an imenu tag index based on all files active in semanticdb.
Optional argument STREAM is the stream of tags for the current buffer."
(if (not semanticdb-current-database)
(semantic-create-imenu-index-1 stream nil)
semantic-imenu-expandable-tag-classes)
children
)
- ;; to keep an homogeneous menu organisation, type menu items
+ ;; to keep an homogeneous menu organization, type menu items
;; always have a sub-menu with at least the *definition*
;; item (even if the tag has no type components)
(progn
semantic-imenu-bucketize-file)
(semantic-create-imenu-index-1 parts tag)
(semantic-create-imenu-subindex parts))))
- ;; Only add a *definition* if we have a postion
+ ;; Only add a *definition* if we have a position
;; in that type tag.
(if (semantic-tag-with-position-p tag)
(cons