diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2010-04-02 21:54:24 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2010-04-02 21:54:24 -0400 |
| commit | 2912322b80f7db17e3aefd58884056f99f1024e6 (patch) | |
| tree | 2dc8988120a3aaedc331c4b4d92021277f05a07b /lisp/cedet | |
| parent | a568f507d1a646c351e1eda0266378316493ab11 (diff) | |
| parent | d86d8ea85a165558eb06fe16ffdf24c06886e7b4 (diff) | |
| download | emacs-2912322b80f7db17e3aefd58884056f99f1024e6.tar.gz | |
Merge from emacs-23
Diffstat (limited to 'lisp/cedet')
| -rw-r--r-- | lisp/cedet/semantic/db-find.el | 2 | ||||
| -rw-r--r-- | lisp/cedet/semantic/imenu.el | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/lisp/cedet/semantic/db-find.el b/lisp/cedet/semantic/db-find.el index 754ba231c37..4c2626ca8bd 100644 --- a/lisp/cedet/semantic/db-find.el +++ b/lisp/cedet/semantic/db-find.el @@ -774,7 +774,7 @@ Examines the variable `semanticdb-find-lost-includes'." (buffer-name)) (data-debug-new-buffer "*SEMANTICDB lost-includes ADEBUG*") - (data-debug-insert-tag-list lost "*") + ;; (data-debug-insert-tag-list lost "*") ))) (defun semanticdb-find-adebug-insert-scanned-tag-cons (consdata prefix prebuttontext) diff --git a/lisp/cedet/semantic/imenu.el b/lisp/cedet/semantic/imenu.el index 3c73b893925..9ce986553aa 100644 --- a/lisp/cedet/semantic/imenu.el +++ b/lisp/cedet/semantic/imenu.el @@ -95,7 +95,7 @@ This option is ignored if `semantic-imenu-bucketize-file' is nil." (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. +A nil value means to keep them in the same order. Overriden to nil if `semantic-imenu-bucketize-file' is nil." :group 'semantic-imenu :type 'boolean) @@ -167,8 +167,8 @@ concoct a combination of file name, and position." (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) @@ -249,7 +249,7 @@ Optional argument STREAM is an optional stream of tags used to create menus." '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) |