aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2009-10-01 04:54:05 +0000
committerGlenn Morris2009-10-01 04:54:05 +0000
commit9bf6c65c2f7d6faed57f689787254f33b50d9b33 (patch)
treefa83704f454ccdc60ebddcd6ae12bb32f9fddee2
parent2551831f20b78304e0a41129fde63d4d8b1a64f0 (diff)
downloademacs-9bf6c65c2f7d6faed57f689787254f33b50d9b33.tar.gz
emacs-9bf6c65c2f7d6faed57f689787254f33b50d9b33.zip
Doc/message fixes.
-rw-r--r--lisp/ChangeLog72
-rw-r--r--lisp/cedet/semantic/analyze.el8
-rw-r--r--lisp/cedet/semantic/analyze/complete.el6
-rw-r--r--lisp/cedet/semantic/analyze/refs.el6
-rw-r--r--lisp/cedet/semantic/bovine/c.el14
-rw-r--r--lisp/cedet/semantic/bovine/el.el6
-rw-r--r--lisp/cedet/semantic/chart.el8
-rw-r--r--lisp/cedet/semantic/complete.el16
-rw-r--r--lisp/cedet/semantic/ctxt.el12
-rw-r--r--lisp/cedet/semantic/db-ebrowse.el5
-rw-r--r--lisp/cedet/semantic/db-find.el18
-rw-r--r--lisp/cedet/semantic/db.el14
-rw-r--r--lisp/cedet/semantic/dep.el6
-rw-r--r--lisp/cedet/semantic/doc.el11
-rw-r--r--lisp/cedet/semantic/edit.el16
-rw-r--r--lisp/cedet/semantic/find.el16
-rw-r--r--lisp/cedet/semantic/format.el8
-rw-r--r--lisp/cedet/semantic/grammar-wy.el2
-rw-r--r--lisp/cedet/semantic/grammar.el8
-rw-r--r--lisp/cedet/semantic/idle.el8
-rw-r--r--lisp/cedet/semantic/lex-spp.el8
-rw-r--r--lisp/cedet/semantic/lex.el30
-rw-r--r--lisp/cedet/semantic/sb.el2
-rw-r--r--lisp/cedet/semantic/scope.el10
-rw-r--r--lisp/cedet/semantic/senator.el12
-rw-r--r--lisp/cedet/semantic/symref.el8
-rw-r--r--lisp/cedet/semantic/symref/filter.el6
-rw-r--r--lisp/cedet/semantic/symref/grep.el6
-rw-r--r--lisp/cedet/semantic/symref/list.el18
-rw-r--r--lisp/cedet/semantic/tag.el23
-rw-r--r--lisp/cedet/semantic/texi.el6
-rw-r--r--lisp/cedet/semantic/util-modes.el8
-rw-r--r--lisp/cedet/semantic/wisent.el2
33 files changed, 237 insertions, 162 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9a0a42f662e..9e87539ab69 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -54,6 +54,78 @@
54 * cedet/ede/cpp-root.el (initialize-instance): 54 * cedet/ede/cpp-root.el (initialize-instance):
55 * cedet/ede/autoconf-edit.el (autoconf-find-last-macro) 55 * cedet/ede/autoconf-edit.el (autoconf-find-last-macro)
56 (autoconf-parameter-strip, autoconf-insert-new-macro): 56 (autoconf-parameter-strip, autoconf-insert-new-macro):
57 * cedet/semantic/wisent.el (wisent-lex-eoi):
58 * cedet/semantic/util-modes.el (global-semantic-show-parser-state-mode)
59 (semantic-show-parser-state-mode):
60 * cedet/semantic/texi.el (semantic-texi-environment-regexp):
61 * cedet/semantic/tag.el (semantic-tag-new-variable)
62 (semantic-tag-class, semantic-tag-new-variable, semantic-tag-copy)
63 (semantic--tag-deep-copy-attributes, semantic--tag-deep-copy-value)
64 (semantic--tag-deep-copy-tag-list)
65 (semantic-tag-components-with-overlays-default):
66 * cedet/semantic/symref.el (semantic-symref-find-text):
67 * cedet/semantic/senator.el (senator-yank-tag)
68 (senator-transpose-tags-up):
69 * cedet/semantic/scope.el (semantic-analyze-scoped-tags-default)
70 (semantic-analyze-scoped-inherited-tags, semantic-scope-find):
71 * cedet/semantic/sb.el (semantic-sb-autoexpand-length):
72 * cedet/semantic/lex.el (semantic-lex-comment-regex)
73 (semantic-lex-maximum-depth, define-lex, semantic-lex-token)
74 (semantic-lex-unterminated-syntax-protection, define-lex-analyzer):
75 * cedet/semantic/lex-spp.el
76 (semantic-lex-spp-dynamic-macro-symbol-obarray-stack)
77 (semantic-lex-spp-symbol, semantic-lex-spp-one-token-to-txt):
78 * cedet/semantic/idle.el
79 (semantic-idle-summary-current-symbol-info-brutish)
80 (semantic-idle-summary-current-symbol-info-default):
81 * cedet/semantic/grammar.el (semantic-grammar-recreate-package)
82 (semantic--grammar-macro-compl-dict):
83 * cedet/semantic/grammar-wy.el (semantic-grammar-wy--parse-table):
84 * cedet/semantic/format.el (semantic-format-tag-custom-list)
85 (semantic-format-tag-canonical-name-default):
86 * cedet/semantic/find.el (semantic-find-tag-by-overlay-in-region)
87 (semantic-find-tags-for-completion)
88 (semantic-find-tags-by-scope-protection-default)
89 (semantic-deep-find-tags-for-completion):
90 * cedet/semantic/edit.el
91 (semantic-edits-incremental-reparse-failed-hook)
92 (semantic-edits-verbose-flag, semantic-edits-assert-valid-region)
93 (semantic-edits-splice-remove, semantic-edits-splice-replace):
94 * cedet/semantic/doc.el (semantic-documentation-comment-preceeding-tag):
95 * cedet/semantic/dep.el (semantic-dependency-include-path):
96 * cedet/semantic/db.el (semanticdb-default-find-index-class)
97 (semanticdb-match-any-mode, semanticdb-with-match-any-mode)
98 (semanticdb-project-roots):
99 * cedet/semantic/db-find.el (semanticdb-implied-include-tags)
100 (semanticdb-find-adebug-insert-scanned-tag-cons)
101 (semanticdb-find-log-buffer-name, semanticdb-find-result-mapc)
102 (semanticdb-brute-deep-find-tags-for-completion):
103 * cedet/semantic/db-ebrowse.el (semanticdb-ebrowse-add-tree-to-table):
104 * cedet/semantic/ctxt.el (semantic-beginning-of-context-default)
105 (semantic-end-of-context-default)
106 (semantic-ctxt-current-function-default)
107 (semantic-ctxt-scoped-types-default):
108 * cedet/semantic/complete.el (semantic-complete-read-tag-engine)
109 (semantic-complete-inline-tag-engine)
110 (semantic-complete-inline-custom-type)
111 (semantic-complete-read-tag-analyzer):
112 * cedet/semantic/chart.el (semantic-chart-tags-by-class)
113 (semantic-chart-database-size):
114 * cedet/semantic/analyze.el (semantic-analyze-current-symbol)
115 (semantic-analyze-current-context):
116 * cedet/semantic/symref/list.el (semantic-symref)
117 (semantic-symref-hide-buffer, semantic-symref-symbol):
118 * cedet/semantic/symref/grep.el (semantic-symref-grep-use-template):
119 * cedet/semantic/symref/filter.el (semantic-symref-hits-in-region):
120 * cedet/semantic/bovine/el.el (semantic-elisp-form-to-doc-string):
121 * cedet/semantic/bovine/c.el (semantic-lex-c-preprocessor-symbol-map)
122 (semantic-c-parse-token-hack-depth, semantic-c--template-name-1)
123 (semantic-c-dereference-template):
124 * cedet/semantic/analyze/refs.el (semantic--analyze-refs-full-lookup)
125 (semantic--analyze-refs-full-lookup-with-parents)
126 (semantic--analyze-refs-full-lookup-simple):
127 * cedet/semantic/analyze/complete.el
128 (semantic-analyze-possible-completions):
57 * cedet/srecode/table.el (srecode-mode-table-new): 129 * cedet/srecode/table.el (srecode-mode-table-new):
58 * cedet/srecode/srt.el (srecode-read-variable-name): 130 * cedet/srecode/srt.el (srecode-read-variable-name):
59 * cedet/srecode/srt-mode.el (srecode-macro-help, srecode-in-macro-p): 131 * cedet/srecode/srt-mode.el (srecode-macro-help, srecode-in-macro-p):
diff --git a/lisp/cedet/semantic/analyze.el b/lisp/cedet/semantic/analyze.el
index 4948bba794e..7acd237d514 100644
--- a/lisp/cedet/semantic/analyze.el
+++ b/lisp/cedet/semantic/analyze.el
@@ -1,7 +1,7 @@
1;;; semantic/analyze.el --- Analyze semantic tags against local context 1;;; semantic/analyze.el --- Analyze semantic tags against local context
2 2
3;;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008, 2009 3;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008, 2009
4;;; Free Software Foundation, Inc. 4;; Free Software Foundation, Inc.
5 5
6;; Author: Eric M. Ludlam <zappo@gnu.org> 6;; Author: Eric M. Ludlam <zappo@gnu.org>
7 7
@@ -414,7 +414,7 @@ to calculate the context information. The purpose for this function is
414to provide a large number of non-cached analysis for filtering symbols." 414to provide a large number of non-cached analysis for filtering symbols."
415 ;; Only do this in a Semantic enabled buffer. 415 ;; Only do this in a Semantic enabled buffer.
416 (when (not (semantic-active-p)) 416 (when (not (semantic-active-p))
417 (error "Cannot analyze buffers not supported by Semantic.")) 417 (error "Cannot analyze buffers not supported by Semantic"))
418 ;; Always refresh out tags in a safe way before doing the 418 ;; Always refresh out tags in a safe way before doing the
419 ;; context. 419 ;; context.
420 (semantic-refresh-tags-safe) 420 (semantic-refresh-tags-safe)
@@ -482,7 +482,7 @@ if a cached copy of the return object is found."
482 (interactive "d") 482 (interactive "d")
483 ;; Only do this in a Semantic enabled buffer. 483 ;; Only do this in a Semantic enabled buffer.
484 (when (not (semantic-active-p)) 484 (when (not (semantic-active-p))
485 (error "Cannot analyze buffers not supported by Semantic.")) 485 (error "Cannot analyze buffers not supported by Semantic"))
486 ;; Always refresh out tags in a safe way before doing the 486 ;; Always refresh out tags in a safe way before doing the
487 ;; context. 487 ;; context.
488 (semantic-refresh-tags-safe) 488 (semantic-refresh-tags-safe)
diff --git a/lisp/cedet/semantic/analyze/complete.el b/lisp/cedet/semantic/analyze/complete.el
index 5d858e59949..de392514d66 100644
--- a/lisp/cedet/semantic/analyze/complete.el
+++ b/lisp/cedet/semantic/analyze/complete.el
@@ -1,6 +1,6 @@
1;;; semantic/analyze/complete.el --- Smart Completions 1;;; semantic/analyze/complete.el --- Smart Completions
2 2
3;;; Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc. 3;; Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc.
4 4
5;; Author: Eric M. Ludlam <zappo@gnu.org> 5;; Author: Eric M. Ludlam <zappo@gnu.org>
6 6
@@ -21,7 +21,7 @@
21 21
22;;; Commentary: 22;;; Commentary:
23;; 23;;
24;; Caclulate smart completions. 24;; Calculate smart completions.
25;; 25;;
26;; Uses the analyzer context routine to determine the best possible 26;; Uses the analyzer context routine to determine the best possible
27;; list of completions. 27;; list of completions.
@@ -88,7 +88,7 @@ in a buffer."
88 context 88 context
89 (semantic-analyze-current-context context))) 89 (semantic-analyze-current-context context)))
90 (ans (if (not context) 90 (ans (if (not context)
91 (error "Nothing to Complete.") 91 (error "Nothing to complete")
92 (:override)))) 92 (:override))))
93 ;; If interactive, display them. 93 ;; If interactive, display them.
94 (when (interactive-p) 94 (when (interactive-p)
diff --git a/lisp/cedet/semantic/analyze/refs.el b/lisp/cedet/semantic/analyze/refs.el
index 8e2f2120d69..ca85d471a9c 100644
--- a/lisp/cedet/semantic/analyze/refs.el
+++ b/lisp/cedet/semantic/analyze/refs.el
@@ -140,7 +140,7 @@ Optional argument IN-BUFFER indicates that the returned tag should be in an acti
140;;; LOOKUP 140;;; LOOKUP
141;; 141;;
142(defun semantic--analyze-refs-full-lookup (tag scope) 142(defun semantic--analyze-refs-full-lookup (tag scope)
143 "Perform a full lookup for all occurances of TAG in the current project. 143 "Perform a full lookup for all occurrences of TAG in the current project.
144TAG should be the tag currently under point. 144TAG should be the tag currently under point.
145PARENT is the list of tags that are parents to TAG by 145PARENT is the list of tags that are parents to TAG by
146containment, as opposed to reference." 146containment, as opposed to reference."
@@ -195,7 +195,7 @@ PARENTS is a list of names."
195 ans)) 195 ans))
196 196
197(defun semantic--analyze-refs-full-lookup-with-parents (tag scope) 197(defun semantic--analyze-refs-full-lookup-with-parents (tag scope)
198 "Perform a lookup for all occurances of TAG based on TAG's SCOPE. 198 "Perform a lookup for all occurrences of TAG based on TAG's SCOPE.
199TAG should be the tag currently under point." 199TAG should be the tag currently under point."
200 (let* ((classmatch (semantic-tag-class tag)) 200 (let* ((classmatch (semantic-tag-class tag))
201 (plist (mapcar (lambda (T) (semantic-tag-name T)) (oref scope parents))) 201 (plist (mapcar (lambda (T) (semantic-tag-name T)) (oref scope parents)))
@@ -242,7 +242,7 @@ TAG should be the tag currently under point."
242 answer)) 242 answer))
243 243
244(defun semantic--analyze-refs-full-lookup-simple (tag &optional noerror) 244(defun semantic--analyze-refs-full-lookup-simple (tag &optional noerror)
245 "Perform a simple lookup for occurances of TAG in the current project. 245 "Perform a simple lookup for occurrences of TAG in the current project.
246TAG should be the tag currently under point. 246TAG should be the tag currently under point.
247Optional NOERROR means don't throw errors on failure to find something. 247Optional NOERROR means don't throw errors on failure to find something.
248This only compares the tag name, and does not infer any matches in namespaces, 248This only compares the tag name, and does not infer any matches in namespaces,
diff --git a/lisp/cedet/semantic/bovine/c.el b/lisp/cedet/semantic/bovine/c.el
index b9077a2ef0b..9bcf6b1f5c5 100644
--- a/lisp/cedet/semantic/bovine/c.el
+++ b/lisp/cedet/semantic/bovine/c.el
@@ -1,7 +1,7 @@
1;;; semantic/bovine/c.el --- Semantic details for C 1;;; semantic/bovine/c.el --- Semantic details for C
2 2
3;;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 3;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
4;;; 2007, 2008, 2009 Free Software Foundation, Inc. 4;; 2008, 2009 Free Software Foundation, Inc.
5 5
6;; Author: Eric M. Ludlam <zappo@gnu.org> 6;; Author: Eric M. Ludlam <zappo@gnu.org>
7 7
@@ -168,7 +168,7 @@ lexical analyzer, such as `symbol' or `string'. The string in the
168second position is the text that makes up the replacement. This is 168second position is the text that makes up the replacement. This is
169the way to have multiple lexical symbols in a replacement. Using the 169the way to have multiple lexical symbols in a replacement. Using the
170first way to specify text like \"foo::bar\" would not work, because : 170first way to specify text like \"foo::bar\" would not work, because :
171is a sepearate lexical symbol. 171is a separate lexical symbol.
172 172
173A quick way to see what you would need to insert is to place a 173A quick way to see what you would need to insert is to place a
174definition such as: 174definition such as:
@@ -682,7 +682,7 @@ as for the parent."
682 )) 682 ))
683 683
684(defvar semantic-c-parse-token-hack-depth 0 684(defvar semantic-c-parse-token-hack-depth 0
685 "Current depth of recursive calls to `semantic-c-parse-lexical-token'") 685 "Current depth of recursive calls to `semantic-c-parse-lexical-token'.")
686 686
687(defun semantic-c-parse-lexical-token (lexicaltoken nonterminal depth 687(defun semantic-c-parse-lexical-token (lexicaltoken nonterminal depth
688 returnonerror) 688 returnonerror)
@@ -1284,8 +1284,8 @@ SPEC-LIST is the template specifier of the datatype instantiated."
1284 (semantic-c--instantiate-template tag (cdr def-list) (cdr spec-list)))) 1284 (semantic-c--instantiate-template tag (cdr def-list) (cdr spec-list))))
1285 1285
1286(defun semantic-c--template-name-1 (spec-list) 1286(defun semantic-c--template-name-1 (spec-list)
1287 "return a string used to compute template class name based on SPEC-LIST 1287 "Return a string used to compute template class name.
1288for ref<Foo,Bar> it will return 'Foo,Bar'." 1288Based on SPEC-LIST, for ref<Foo,Bar> it will return 'Foo,Bar'."
1289 (when (car spec-list) 1289 (when (car spec-list)
1290 (let* ((endpart (semantic-c--template-name-1 (cdr spec-list))) 1290 (let* ((endpart (semantic-c--template-name-1 (cdr spec-list)))
1291 (separator (and endpart ","))) 1291 (separator (and endpart ",")))
@@ -1299,7 +1299,7 @@ return 'ref<Foo,Bar>'."
1299 "<" (semantic-c--template-name-1 (cdr spec-list)) ">")) 1299 "<" (semantic-c--template-name-1 (cdr spec-list)) ">"))
1300 1300
1301(defun semantic-c-dereference-template (type scope &optional type-declaration) 1301(defun semantic-c-dereference-template (type scope &optional type-declaration)
1302 "Dereference any template specifieres in TYPE within SCOPE. 1302 "Dereference any template specifiers in TYPE within SCOPE.
1303If TYPE is a template, return a TYPE copy with the templates types 1303If TYPE is a template, return a TYPE copy with the templates types
1304instantiated as specified in TYPE-DECLARATION." 1304instantiated as specified in TYPE-DECLARATION."
1305 (when (semantic-tag-p type-declaration) 1305 (when (semantic-tag-p type-declaration)
diff --git a/lisp/cedet/semantic/bovine/el.el b/lisp/cedet/semantic/bovine/el.el
index 596e29228f9..4cf03494c10 100644
--- a/lisp/cedet/semantic/bovine/el.el
+++ b/lisp/cedet/semantic/bovine/el.el
@@ -1,7 +1,7 @@
1;;; semantic/bovine/el.el --- Semantic details for Emacs Lisp 1;;; semantic/bovine/el.el --- Semantic details for Emacs Lisp
2 2
3;;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007, 3;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008,
4;;; 2008, 2009 Free Software Foundation, Inc. 4;; 2009 Free Software Foundation, Inc.
5 5
6;; Author: Eric M. Ludlam <zappo@gnu.org> 6;; Author: Eric M. Ludlam <zappo@gnu.org>
7 7
@@ -140,7 +140,7 @@ syntax as specified by the syntax table."
140 140
141(defun semantic-elisp-form-to-doc-string (form) 141(defun semantic-elisp-form-to-doc-string (form)
142 "After reading a form FORM, covert it to a doc string. 142 "After reading a form FORM, covert it to a doc string.
143For Emacs Lisp, sometimes that string is non-existant. 143For Emacs Lisp, sometimes that string is non-existent.
144Sometimes it is a form which is evaluated at compile time, permitting 144Sometimes it is a form which is evaluated at compile time, permitting
145compound strings." 145compound strings."
146 (cond ((stringp form) form) 146 (cond ((stringp form) form)
diff --git a/lisp/cedet/semantic/chart.el b/lisp/cedet/semantic/chart.el
index 7efe4e6dfae..c526005c7d2 100644
--- a/lisp/cedet/semantic/chart.el
+++ b/lisp/cedet/semantic/chart.el
@@ -1,7 +1,7 @@
1;;; semantic/chart.el --- Utilities for use with semantic tag tables 1;;; semantic/chart.el --- Utilities for use with semantic tag tables
2 2
3;;; Copyright (C) 1999, 2000, 2001, 2003, 2005, 2008, 2009 3;; Copyright (C) 1999, 2000, 2001, 2003, 2005, 2008, 2009
4;;; Free Software Foundation, Inc. 4;; Free Software Foundation, Inc.
5 5
6;; Author: Eric M. Ludlam <zappo@gnu.org> 6;; Author: Eric M. Ludlam <zappo@gnu.org>
7 7
@@ -40,7 +40,7 @@
40Each bar represents how many toplevel tags in TAGTABLE 40Each bar represents how many toplevel tags in TAGTABLE
41exist with a given class. See `semantic-symbol->name-assoc-list' 41exist with a given class. See `semantic-symbol->name-assoc-list'
42for tokens which will be charted. 42for tokens which will be charted.
43TAGTABLE is passedto `semantic-something-to-tag-table'." 43TAGTABLE is passed to `semantic-something-to-tag-table'."
44 (interactive) 44 (interactive)
45 (let* ((stream (semantic-something-to-tag-table 45 (let* ((stream (semantic-something-to-tag-table
46 (or tagtable (current-buffer)))) 46 (or tagtable (current-buffer))))
@@ -108,7 +108,7 @@ TAGTABLE is passed to `semantic-something-to-tag-table'."
108 "Create a bar chart representing the complexity of some tags. 108 "Create a bar chart representing the complexity of some tags.
109Complexity is calculated for tags of CLASS. Each bar represents 109Complexity is calculated for tags of CLASS. Each bar represents
110the complexity of some tag in TAGTABLE. Only the most complex 110the complexity of some tag in TAGTABLE. Only the most complex
111items are charted. TAGTABLE is passedto 111items are charted. TAGTABLE is passed to
112`semantic-something-to-tag-table'." 112`semantic-something-to-tag-table'."
113 (interactive) 113 (interactive)
114 (let* ((sym (if (not class) 'function)) 114 (let* ((sym (if (not class) 'function))
diff --git a/lisp/cedet/semantic/complete.el b/lisp/cedet/semantic/complete.el
index a61bccbcb62..1c887672819 100644
--- a/lisp/cedet/semantic/complete.el
+++ b/lisp/cedet/semantic/complete.el
@@ -1,7 +1,7 @@
1;;; semantic/complete.el --- Routines for performing tag completion 1;;; semantic/complete.el --- Routines for performing tag completion
2 2
3;;; Copyright (C) 2003, 2004, 2005, 2007, 2008, 2009 3;; Copyright (C) 2003, 2004, 2005, 2007, 2008, 2009
4;;; Free Software Foundation, Inc. 4;; Free Software Foundation, Inc.
5 5
6;; Author: Eric M. Ludlam <zappo@gnu.org> 6;; Author: Eric M. Ludlam <zappo@gnu.org>
7;; Keywords: syntax 7;; Keywords: syntax
@@ -36,7 +36,7 @@
36;; quickly without resorting to "show me every possible option now". 36;; quickly without resorting to "show me every possible option now".
37;; 37;;
38;; In addition, some symbol names will appear in multiple locations. 38;; In addition, some symbol names will appear in multiple locations.
39;; If it is important to distiguish, then a way to provide a choice 39;; If it is important to distinguish, then a way to provide a choice
40;; over these locations is important as well. 40;; over these locations is important as well.
41;; 41;;
42;; Beyond brute force offers for completion of plain strings, 42;; Beyond brute force offers for completion of plain strings,
@@ -55,7 +55,7 @@
55;; 55;;
56;; Here, we will treat each section separately (excluding D) 56;; Here, we will treat each section separately (excluding D)
57;; They can then be strung together in user-visible commands to 57;; They can then be strung together in user-visible commands to
58;; fullfill specific needs. 58;; fulfil specific needs.
59;; 59;;
60;; COLLECTORS: 60;; COLLECTORS:
61;; 61;;
@@ -194,7 +194,7 @@ Keeps STRINGS only in the history.")
194Argument COLLECTOR is an object which can be used to to calculate 194Argument COLLECTOR is an object which can be used to to calculate
195a list of possible hits. See `semantic-completion-collector-engine' 195a list of possible hits. See `semantic-completion-collector-engine'
196for details on COLLECTOR. 196for details on COLLECTOR.
197Argumeng DISPLAYOR is an object used to display a list of possible 197Argument DISPLAYOR is an object used to display a list of possible
198completions for a given prefix. See`semantic-completion-display-engine' 198completions for a given prefix. See`semantic-completion-display-engine'
199for details on DISPLAYOR. 199for details on DISPLAYOR.
200PROMPT is a string to prompt with. 200PROMPT is a string to prompt with.
@@ -736,7 +736,7 @@ DO NOT CALL THIS IF THE INLINE COMPLETION ENGINE IS NOT ACTIVE."
736Argument COLLECTOR is an object which can be used to to calculate 736Argument COLLECTOR is an object which can be used to to calculate
737a list of possible hits. See `semantic-completion-collector-engine' 737a list of possible hits. See `semantic-completion-collector-engine'
738for details on COLLECTOR. 738for details on COLLECTOR.
739Argumeng DISPLAYOR is an object used to display a list of possible 739Argument DISPLAYOR is an object used to display a list of possible
740completions for a given prefix. See`semantic-completion-display-engine' 740completions for a given prefix. See`semantic-completion-display-engine'
741for details on DISPLAYOR. 741for details on DISPLAYOR.
742BUFFER is the buffer in which completion will take place. 742BUFFER is the buffer in which completion will take place.
@@ -1766,7 +1766,7 @@ completion text in ghost text."
1766 C))) 1766 C)))
1767 (eieio-build-class-alist semantic-displayor-abstract t)) 1767 (eieio-build-class-alist semantic-displayor-abstract t))
1768 ) 1768 )
1769 "Possible options for inlince completion displayors. 1769 "Possible options for inline completion displayors.
1770Use this to enable custom editing.") 1770Use this to enable custom editing.")
1771 1771
1772(defcustom semantic-complete-inline-analyzer-displayor-class 1772(defcustom semantic-complete-inline-analyzer-displayor-class
@@ -1879,7 +1879,7 @@ to generate the list of possible completions.
1879PROMPT is the first part of the prompt. Additional prompt 1879PROMPT is the first part of the prompt. Additional prompt
1880is added based on the contexts full prefix. 1880is added based on the contexts full prefix.
1881CONTEXT is the semantic analyzer context to start with. 1881CONTEXT is the semantic analyzer context to start with.
1882HISTORY is a symbol representing a variable to stor the history in. 1882HISTORY is a symbol representing a variable to store the history in.
1883usually a default-tag and initial-input are available for completion 1883usually a default-tag and initial-input are available for completion
1884prompts. these are calculated from the CONTEXT variable passed in." 1884prompts. these are calculated from the CONTEXT variable passed in."
1885 (if (not context) (setq context (semantic-analyze-current-context (point)))) 1885 (if (not context) (setq context (semantic-analyze-current-context (point))))
diff --git a/lisp/cedet/semantic/ctxt.el b/lisp/cedet/semantic/ctxt.el
index ab72f4d4e7f..a33d0ad90ae 100644
--- a/lisp/cedet/semantic/ctxt.el
+++ b/lisp/cedet/semantic/ctxt.el
@@ -1,7 +1,7 @@
1;;; semantic/ctxt.el --- Context calculations for Semantic tools. 1;;; semantic/ctxt.el --- Context calculations for Semantic tools.
2 2
3;;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 3;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
4;;; 2007, 2008, 2009 Free Software Foundation, Inc. 4;; 2007, 2008, 2009 Free Software Foundation, Inc.
5 5
6;; Author: Eric M. Ludlam <zappo@gnu.org> 6;; Author: Eric M. Ludlam <zappo@gnu.org>
7;; Keywords: syntax 7;; Keywords: syntax
@@ -86,7 +86,7 @@ Return non-nil if there is no upper context.
86The default behavior uses `semantic-up-context'.") 86The default behavior uses `semantic-up-context'.")
87 87
88(defun semantic-beginning-of-context-default (&optional point) 88(defun semantic-beginning-of-context-default (&optional point)
89 "Move POINT to the beginning of the current context via parenthisis. 89 "Move POINT to the beginning of the current context via parenthesis.
90Return non-nil if there is no upper context." 90Return non-nil if there is no upper context."
91 (if point (goto-char point)) 91 (if point (goto-char point))
92 (if (semantic-up-context) 92 (if (semantic-up-context)
@@ -101,7 +101,7 @@ Be default, this uses `semantic-up-context', and assumes parenthetical
101block delimiters.") 101block delimiters.")
102 102
103(defun semantic-end-of-context-default (&optional point) 103(defun semantic-end-of-context-default (&optional point)
104 "Move POINT to the end of the current context via parenthisis. 104 "Move POINT to the end of the current context via parenthesis.
105Return non-nil if there is no upper context." 105Return non-nil if there is no upper context."
106 (if point (goto-char point)) 106 (if point (goto-char point))
107 (let ((start (point))) 107 (let ((start (point)))
@@ -510,7 +510,7 @@ cursor is on the text representing that function.")
510 510
511(defun semantic-ctxt-current-function-default (&optional point) 511(defun semantic-ctxt-current-function-default (&optional point)
512 "Return the current function call the cursor is in at POINT. 512 "Return the current function call the cursor is in at POINT.
513The call will be identifed for C like langauges with the form 513The call will be identified for C like languages with the form
514 NAME ( args ... )" 514 NAME ( args ... )"
515 (if point (goto-char point)) 515 (if point (goto-char point))
516 (let ((case-fold-search semantic-case-fold)) 516 (let ((case-fold-search semantic-case-fold))
@@ -602,7 +602,7 @@ that may or may not have a name.)")
602(defun semantic-ctxt-scoped-types-default (&optional point) 602(defun semantic-ctxt-scoped-types-default (&optional point)
603 "Return a list of scoped types by name for the current context at POINT. 603 "Return a list of scoped types by name for the current context at POINT.
604This is very different for various languages, and does nothing unless 604This is very different for various languages, and does nothing unless
605overriden." 605overridden."
606 (if point (goto-char point)) 606 (if point (goto-char point))
607 (let ((case-fold-search semantic-case-fold)) 607 (let ((case-fold-search semantic-case-fold))
608 ;; We need to look at TYPES within the bounds of locally parse arguments. 608 ;; We need to look at TYPES within the bounds of locally parse arguments.
diff --git a/lisp/cedet/semantic/db-ebrowse.el b/lisp/cedet/semantic/db-ebrowse.el
index 8649a49977f..381a9299052 100644
--- a/lisp/cedet/semantic/db-ebrowse.el
+++ b/lisp/cedet/semantic/db-ebrowse.el
@@ -1,6 +1,7 @@
1;;; semantic/db-ebrowse.el --- Semanticdb backend using ebrowse. 1;;; semantic/db-ebrowse.el --- Semanticdb backend using ebrowse.
2 2
3;;; Copyright (C) 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. 3;; Copyright (C) 2005, 2006, 2007, 2008, 2009
4;; Free Software Foundation, Inc.
4 5
5;; Authors: Eric M. Ludlam <zappo@gnu.org> 6;; Authors: Eric M. Ludlam <zappo@gnu.org>
6;; Joakim Verona 7;; Joakim Verona
@@ -403,7 +404,7 @@ If there is no database for DIRECTORY available, then
403 404
404(defun semanticdb-ebrowse-add-tree-to-table (dbe tree &optional fname baseclasses) 405(defun semanticdb-ebrowse-add-tree-to-table (dbe tree &optional fname baseclasses)
405 "For database DBE, add the ebrowse TREE into the table for FNAME. 406 "For database DBE, add the ebrowse TREE into the table for FNAME.
406Optional argument BASECLASSES specifyies a baseclass to the tree being provided." 407Optional argument BASECLASSES specifies a baseclass to the tree being provided."
407 (if (not (ebrowse-ts-p tree)) 408 (if (not (ebrowse-ts-p tree))
408 (signal 'wrong-type-argument (list 'ebrowse-ts-p tree))) 409 (signal 'wrong-type-argument (list 'ebrowse-ts-p tree)))
409 410
diff --git a/lisp/cedet/semantic/db-find.el b/lisp/cedet/semantic/db-find.el
index e7ce7fcbdef..5a043c45c60 100644
--- a/lisp/cedet/semantic/db-find.el
+++ b/lisp/cedet/semantic/db-find.el
@@ -1,7 +1,7 @@
1;;; semantic/db-find.el --- Searching through semantic databases. 1;;; semantic/db-find.el --- Searching through semantic databases.
2 2
3;;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 3;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
4;;; 2008, 2009 Free Software Foundation, Inc. 4;; 2009 Free Software Foundation, Inc.
5 5
6;; Author: Eric M. Ludlam <zappo@gnu.org> 6;; Author: Eric M. Ludlam <zappo@gnu.org>
7;; Keywords: tags 7;; Keywords: tags
@@ -103,7 +103,7 @@
103;; eldoc - popup help 103;; eldoc - popup help
104;; => Requires basic search using default path. (Header files ok) 104;; => Requires basic search using default path. (Header files ok)
105;; tag jump - jump to a named tag 105;; tag jump - jump to a named tag
106;; => Requires a brute search useing whole project. (Source files only) 106;; => Requires a brute search using whole project. (Source files only)
107;; completion - Completing symbol names in a smart way 107;; completion - Completing symbol names in a smart way
108;; => Basic search (headers ok) 108;; => Basic search (headers ok)
109;; type analysis - finding type definitions for variables & fcns 109;; type analysis - finding type definitions for variables & fcns
@@ -440,7 +440,7 @@ and TAG is a clone of the include tag that was found.")
440Set this variable with `defvar-mode-local' for a particular mode so 440Set this variable with `defvar-mode-local' for a particular mode so
441that any symbols that exist for all files for that mode are included. 441that any symbols that exist for all files for that mode are included.
442 442
443Note: This could be used as a way to write a file in a langauge 443Note: This could be used as a way to write a file in a language
444to declare all the built-ins for that language.") 444to declare all the built-ins for that language.")
445 445
446(defun semanticdb-find-translate-path-includes--internal (path) 446(defun semanticdb-find-translate-path-includes--internal (path)
@@ -781,7 +781,7 @@ Examines the variable `semanticdb-find-lost-includes'."
781 781
782(defun semanticdb-find-adebug-insert-scanned-tag-cons (consdata prefix prebuttontext) 782(defun semanticdb-find-adebug-insert-scanned-tag-cons (consdata prefix prebuttontext)
783 "Insert a button representing scanned include CONSDATA. 783 "Insert a button representing scanned include CONSDATA.
784PREFIX is the text that preceeds the button. 784PREFIX is the text that precedes the button.
785PREBUTTONTEXT is some text between prefix and the overlay button." 785PREBUTTONTEXT is some text between prefix and the overlay button."
786 (let* ((start (point)) 786 (let* ((start (point))
787 (end nil) 787 (end nil)
@@ -1019,7 +1019,7 @@ is still made current."
1019(defun semanticdb-find-result-mapc (fcn result) 1019(defun semanticdb-find-result-mapc (fcn result)
1020 "Apply FCN to each element of find RESULT for side-effects only. 1020 "Apply FCN to each element of find RESULT for side-effects only.
1021FCN takes two arguments. The first is a TAG, and the 1021FCN takes two arguments. The first is a TAG, and the
1022second is a DB from wence TAG originated. 1022second is a DB from whence TAG originated.
1023Returns result." 1023Returns result."
1024 (mapc (lambda (sublst) 1024 (mapc (lambda (sublst)
1025 (mapc (lambda (tag) 1025 (mapc (lambda (tag)
@@ -1038,7 +1038,7 @@ Returns result."
1038 "The name of the logging buffer.") 1038 "The name of the logging buffer.")
1039 1039
1040(defun semanticdb-find-toggle-logging () 1040(defun semanticdb-find-toggle-logging ()
1041 "Toggle sematnicdb logging." 1041 "Toggle semanticdb logging."
1042 (interactive) 1042 (interactive)
1043 (setq semanticdb-find-log-flag (null semanticdb-find-log-flag)) 1043 (setq semanticdb-find-log-flag (null semanticdb-find-log-flag))
1044 (message "Semanticdb find logging is %sabled" 1044 (message "Semanticdb find logging is %sabled"
@@ -1239,7 +1239,7 @@ associated with that tag should be loaded into a buffer."
1239See `semanticdb-find-translate-path' for details on PATH. 1239See `semanticdb-find-translate-path' for details on PATH.
1240The argument BRUTISH will be set so that searching includes all tables 1240The argument BRUTISH will be set so that searching includes all tables
1241in the current project. 1241in the current project.
1242FIND-FILE-MATCH indicates that any time a matchi is found, the file 1242FIND-FILE-MATCH indicates that any time a match is found, the file
1243associated wit that tag should be loaded into a buffer." 1243associated wit that tag should be loaded into a buffer."
1244 (semanticdb-find-tags-collector 1244 (semanticdb-find-tags-collector
1245 (lambda (table tags) 1245 (lambda (table tags)
@@ -1251,7 +1251,7 @@ associated wit that tag should be loaded into a buffer."
1251See `semanticdb-find-translate-path' for details on PATH. 1251See `semanticdb-find-translate-path' for details on PATH.
1252The argument BRUTISH will be set so that searching includes all tables 1252The argument BRUTISH will be set so that searching includes all tables
1253in the current project. 1253in the current project.
1254FIND-FILE-MATCH indicates that any time a matchi is found, the file 1254FIND-FILE-MATCH indicates that any time a match is found, the file
1255associated wit that tag should be loaded into a buffer." 1255associated wit that tag should be loaded into a buffer."
1256 (semanticdb-find-tags-collector 1256 (semanticdb-find-tags-collector
1257 (lambda (table tags) 1257 (lambda (table tags)
diff --git a/lisp/cedet/semantic/db.el b/lisp/cedet/semantic/db.el
index bc25d31f19e..0dbe4eb0b0a 100644
--- a/lisp/cedet/semantic/db.el
+++ b/lisp/cedet/semantic/db.el
@@ -1,7 +1,7 @@
1;;; semantic/db.el --- Semantic tag database manager 1;;; semantic/db.el --- Semantic tag database manager
2 2
3;;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 3;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
4;;; 2008, 2009 Free Software Foundation, Inc. 4;; 2009 Free Software Foundation, Inc.
5 5
6;; Author: Eric M. Ludlam <zappo@gnu.org> 6;; Author: Eric M. Ludlam <zappo@gnu.org>
7;; Keywords: tags 7;; Keywords: tags
@@ -53,7 +53,7 @@ mechanism.")
53 53
54(defvar semanticdb-default-find-index-class 'semanticdb-find-search-index 54(defvar semanticdb-default-find-index-class 'semanticdb-find-search-index
55 "The default type of search index to use for a `semanticdb-table's. 55 "The default type of search index to use for a `semanticdb-table's.
56This can be changed to try out new types of search indicies.") 56This can be changed to try out new types of search indices.")
57(make-variable-buffer-local 'semanticdb-default-find=index-class) 57(make-variable-buffer-local 'semanticdb-default-find=index-class)
58 58
59;;;###autoload 59;;;###autoload
@@ -709,14 +709,14 @@ Uses `semanticdb-persistent-path' to determine the return value."
709 nil)) 709 nil))
710 710
711(defvar semanticdb-match-any-mode nil 711(defvar semanticdb-match-any-mode nil
712 "Non-nil to temporarilly search any major mode for a tag. 712 "Non-nil to temporarily search any major mode for a tag.
713If a particular major mode wants to search any mode, put the 713If a particular major mode wants to search any mode, put the
714`semantic-match-any-mode' symbol onto the symbol of that major mode. 714`semantic-match-any-mode' symbol onto the symbol of that major mode.
715Do not set the value of this variable permanently.") 715Do not set the value of this variable permanently.")
716 716
717(defmacro semanticdb-with-match-any-mode (&rest body) 717(defmacro semanticdb-with-match-any-mode (&rest body)
718 "A Semanticdb search occuring withing BODY will search tags in all modes. 718 "A Semanticdb search occurring withing BODY will search tags in all modes.
719This temporarilly sets `semanticdb-match-any-mode' while executing BODY." 719This temporarily sets `semanticdb-match-any-mode' while executing BODY."
720 `(let ((semanticdb-match-any-mode t)) 720 `(let ((semanticdb-match-any-mode t))
721 ,@body)) 721 ,@body))
722(put 'semanticdb-with-match-any-mode 'lisp-indent-function 0) 722(put 'semanticdb-with-match-any-mode 'lisp-indent-function 0)
@@ -764,7 +764,7 @@ local variable."
764(defcustom semanticdb-project-roots nil 764(defcustom semanticdb-project-roots nil
765 "*List of directories, where each directory is the root of some project. 765 "*List of directories, where each directory is the root of some project.
766All subdirectories of a root project are considered a part of one project. 766All subdirectories of a root project are considered a part of one project.
767Values in this string can be overriden by project management programs 767Values in this string can be overridden by project management programs
768via the `semanticdb-project-root-functions' variable." 768via the `semanticdb-project-root-functions' variable."
769 :group 'semanticdb 769 :group 'semanticdb
770 :type '(repeat string)) 770 :type '(repeat string))
diff --git a/lisp/cedet/semantic/dep.el b/lisp/cedet/semantic/dep.el
index d4b17744d06..f80f2745c17 100644
--- a/lisp/cedet/semantic/dep.el
+++ b/lisp/cedet/semantic/dep.el
@@ -1,6 +1,6 @@
1;;; semantic/dep.el --- Methods for tracking dependencies (include files) 1;;; semantic/dep.el --- Methods for tracking dependencies (include files)
2 2
3;;; Copyright (C) 2006, 2007, 2008, 2009 Free Software Foundation, Inc. 3;; Copyright (C) 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
4 4
5;; Author: Eric M. Ludlam <zappo@gnu.org> 5;; Author: Eric M. Ludlam <zappo@gnu.org>
6;; Keywords: syntax 6;; Keywords: syntax
@@ -30,7 +30,7 @@
30;; EDE or even ECB can control our project dependencies, and help us 30;; EDE or even ECB can control our project dependencies, and help us
31;; find file within the setting of a given project. For system 31;; find file within the setting of a given project. For system
32;; dependencies, we need to depend on user supplied lists, which can 32;; dependencies, we need to depend on user supplied lists, which can
33;; manifest themselves in the form of system datatabases (from 33;; manifest themselves in the form of system databases (from
34;; semanticdb.) 34;; semanticdb.)
35;; 35;;
36;; Provide ways to track these different files here. 36;; Provide ways to track these different files here.
@@ -47,7 +47,7 @@ to the file being included.
47If `semantic-dependency-tag-file' is overridden for a given 47If `semantic-dependency-tag-file' is overridden for a given
48language, this path is most likely ignored. 48language, this path is most likely ignored.
49 49
50The above function, reguardless of being overriden, caches the 50The above function, regardless of being overridden, caches the
51located dependency file location in the tag property 51located dependency file location in the tag property
52`dependency-file'. If you override this function, you do not 52`dependency-file'. If you override this function, you do not
53need to implement your own cache. Each time the buffer is fully 53need to implement your own cache. Each time the buffer is fully
diff --git a/lisp/cedet/semantic/doc.el b/lisp/cedet/semantic/doc.el
index 9feeee294f6..e92986d1ab4 100644
--- a/lisp/cedet/semantic/doc.el
+++ b/lisp/cedet/semantic/doc.el
@@ -1,7 +1,7 @@
1;;; semantic/doc.el --- Routines for documentation strings 1;;; semantic/doc.el --- Routines for documentation strings
2 2
3;;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2005, 2008, 2009 3;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2005, 2008, 2009
4;;; Free Software Foundation, Inc. 4;; Free Software Foundation, Inc.
5 5
6;; Author: Eric M. Ludlam <zappo@gnu.org> 6;; Author: Eric M. Ludlam <zappo@gnu.org>
7;; Keywords: syntax 7;; Keywords: syntax
@@ -23,7 +23,7 @@
23 23
24;;; Commentary: 24;;; Commentary:
25;; 25;;
26;; It is good practice to write documenation for your functions and 26;; It is good practice to write documentation for your functions and
27;; variables. These core routines deal with these documentation 27;; variables. These core routines deal with these documentation
28;; comments or strings. They can exist either as a tag property 28;; comments or strings. They can exist either as a tag property
29;; (:documentation) or as a comment just before the symbol, or after 29;; (:documentation) or as a comment just before the symbol, or after
@@ -61,10 +61,11 @@ If nosnarf if 'lex, then only return the lex token."
61 ;; Not sure yet. Fill in something clever later.... 61 ;; Not sure yet. Fill in something clever later....
62 nil)))))) 62 nil))))))
63 63
64;; FIXME this is not how you spell "preceding".
64(defun semantic-documentation-comment-preceeding-tag (&optional tag nosnarf) 65(defun semantic-documentation-comment-preceeding-tag (&optional tag nosnarf)
65 "Find a comment preceeding TAG. 66 "Find a comment preceding TAG.
66If TAG is nil. use the tag under point. 67If TAG is nil. use the tag under point.
67Searches the space between TAG and the preceeding tag for a comment, 68Searches the space between TAG and the preceding tag for a comment,
68and converts the comment into clean documentation. 69and converts the comment into clean documentation.
69Optional argument NOSNARF with a value of 'lex means to return 70Optional argument NOSNARF with a value of 'lex means to return
70just the lexical token and not the string." 71just the lexical token and not the string."
diff --git a/lisp/cedet/semantic/edit.el b/lisp/cedet/semantic/edit.el
index cb573e35c1e..11ed2e5a4e4 100644
--- a/lisp/cedet/semantic/edit.el
+++ b/lisp/cedet/semantic/edit.el
@@ -1,7 +1,7 @@
1;;; semantic/edit.el --- Edit Management for Semantic 1;;; semantic/edit.el --- Edit Management for Semantic
2 2
3;;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 3;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
4;;; 2007, 2008, 2009 Free Software Foundation, Inc. 4;; 2008, 2009 Free Software Foundation, Inc.
5 5
6;; Author: Eric M. Ludlam <zappo@gnu.org> 6;; Author: Eric M. Ludlam <zappo@gnu.org>
7 7
@@ -54,7 +54,7 @@
54;; syntax instead. 54;; syntax instead.
55;; 55;;
56;; 2. Incremental parsing while a new function is being typed in 56;; 2. Incremental parsing while a new function is being typed in
57;; somtimes gets a chance only when lists are incomplete, 57;; sometimes gets a chance only when lists are incomplete,
58;; preventing correct context identification. 58;; preventing correct context identification.
59 59
60;; 60;;
@@ -114,13 +114,13 @@ incremental reparse.")
114 114
115(defvar semantic-edits-incremental-reparse-failed-hook nil 115(defvar semantic-edits-incremental-reparse-failed-hook nil
116 "Hook run after the incremental parser fails. 116 "Hook run after the incremental parser fails.
117When this happens, the buffer is marked as needing a full reprase.") 117When this happens, the buffer is marked as needing a full reparse.")
118 118
119(semantic-varalias-obsolete 'semantic-edits-incremental-reparse-failed-hooks 119(semantic-varalias-obsolete 'semantic-edits-incremental-reparse-failed-hooks
120 'semantic-edits-incremental-reparse-failed-hook) 120 'semantic-edits-incremental-reparse-failed-hook)
121 121
122(defcustom semantic-edits-verbose-flag nil 122(defcustom semantic-edits-verbose-flag nil
123 "Non-nil means the incremental perser is verbose. 123 "Non-nil means the incremental parser is verbose.
124If nil, errors are still displayed, but informative messages are not." 124If nil, errors are still displayed, but informative messages are not."
125 :group 'semantic 125 :group 'semantic
126 :type 'boolean) 126 :type 'boolean)
@@ -499,7 +499,7 @@ the semantic cache to see what needs to be changed."
499 changed-tags)) 499 changed-tags))
500 500
501(defmacro semantic-edits-assert-valid-region () 501(defmacro semantic-edits-assert-valid-region ()
502 "Asert that parse-start and parse-end are sorted correctly." 502 "Assert that parse-start and parse-end are sorted correctly."
503;;; (if (> parse-start parse-end) 503;;; (if (> parse-start parse-end)
504;;; (error "Bug is %s !> %d! Buff min/max = [ %d %d ]" 504;;; (error "Bug is %s !> %d! Buff min/max = [ %d %d ]"
505;;; parse-start parse-end 505;;; parse-start parse-end
@@ -838,7 +838,7 @@ This function is for internal use by `semantic-edits-incremental-parser'."
838;; list can be fiddled. 838;; list can be fiddled.
839(defun semantic-edits-splice-remove (oldtags parent cachelist) 839(defun semantic-edits-splice-remove (oldtags parent cachelist)
840 "Remove OLDTAGS from PARENT's CACHELIST. 840 "Remove OLDTAGS from PARENT's CACHELIST.
841OLDTAGS are tags in the currenet buffer, preferably linked 841OLDTAGS are tags in the current buffer, preferably linked
842together also in CACHELIST. 842together also in CACHELIST.
843PARENT is the parent tag containing OLDTAGS. 843PARENT is the parent tag containing OLDTAGS.
844CACHELIST should be the children from PARENT, but may be 844CACHELIST should be the children from PARENT, but may be
@@ -931,7 +931,7 @@ convenient location, so use that."
931 931
932(defun semantic-edits-splice-replace (oldtag newtag) 932(defun semantic-edits-splice-replace (oldtag newtag)
933 "Replace OLDTAG with NEWTAG in the current cache. 933 "Replace OLDTAG with NEWTAG in the current cache.
934Do this by recycling OLDTAG's first CONS cell. This effectivly 934Do this by recycling OLDTAG's first CONS cell. This effectively
935causes the new tag to completely replace the old one. 935causes the new tag to completely replace the old one.
936Make sure that all information in the overlay is transferred. 936Make sure that all information in the overlay is transferred.
937It is presumed that OLDTAG and NEWTAG are both cooked. 937It is presumed that OLDTAG and NEWTAG are both cooked.
diff --git a/lisp/cedet/semantic/find.el b/lisp/cedet/semantic/find.el
index 9886685cb5d..5b5a9296d07 100644
--- a/lisp/cedet/semantic/find.el
+++ b/lisp/cedet/semantic/find.el
@@ -1,7 +1,7 @@
1;;; semantic/find.el --- Search routines for Semantic 1;;; semantic/find.el --- Search routines for Semantic
2 2
3;;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008, 2009 3;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008, 2009
4;;; Free Software Foundation, Inc. 4;; Free Software Foundation, Inc.
5 5
6;; Author: Eric M. Ludlam <zappo@gnu.org> 6;; Author: Eric M. Ludlam <zappo@gnu.org>
7;; Keywords: syntax 7;; Keywords: syntax
@@ -32,11 +32,11 @@
32;; used for compatibility with the semantic 1.x search routines. 32;; used for compatibility with the semantic 1.x search routines.
33;; 33;;
34;; 1.5) semantic-brute-find-first-tag-by-* 34;; 1.5) semantic-brute-find-first-tag-by-*
35;; Like 1, except seraching stops on the first match for the given 35;; Like 1, except searching stops on the first match for the given
36;; information. 36;; information.
37;; 37;;
38;; 2) semantic-find-tag-by-* 38;; 2) semantic-find-tag-by-*
39;; These prefered search routines attempt to scan through lists 39;; These preferred search routines attempt to scan through lists
40;; in an intelligent way based on questions asked. 40;; in an intelligent way based on questions asked.
41;; 41;;
42;; 3) semantic-find-*-overlay 42;; 3) semantic-find-*-overlay
@@ -86,7 +86,7 @@ from largest to smallest via the start location."
86;;;###autoload 86;;;###autoload
87(defun semantic-find-tag-by-overlay-in-region (start end &optional buffer) 87(defun semantic-find-tag-by-overlay-in-region (start end &optional buffer)
88 "Find all tags which exist in whole or in part between START and END. 88 "Find all tags which exist in whole or in part between START and END.
89Uses overlays to determine positin. 89Uses overlays to determine position.
90Optional BUFFER argument specifies the buffer to use." 90Optional BUFFER argument specifies the buffer to use."
91 (save-excursion 91 (save-excursion
92 (if buffer (set-buffer buffer)) 92 (if buffer (set-buffer buffer))
@@ -279,7 +279,7 @@ TABLE is a tag table. See `semantic-something-to-tag-table'."
279 ,table))) 279 ,table)))
280 280
281(defmacro semantic-find-tags-for-completion (prefix &optional table) 281(defmacro semantic-find-tags-for-completion (prefix &optional table)
282 "Find all tags whos name begins with PREFIX in TABLE. 282 "Find all tags whose name begins with PREFIX in TABLE.
283PREFIX is a string. 283PREFIX is a string.
284TABLE is a tag table. See `semantic-something-to-tag-table'. 284TABLE is a tag table. See `semantic-something-to-tag-table'.
285While it would be nice to use `try-completion' or `all-completions', 285While it would be nice to use `try-completion' or `all-completions',
@@ -350,7 +350,7 @@ See `semantic-tag-protected-p' for details on which tags are returned."
350 350
351(defun semantic-find-tags-by-scope-protection-default 351(defun semantic-find-tags-by-scope-protection-default
352 (scopeprotection parent &optional table) 352 (scopeprotection parent &optional table)
353 "Find all tags accessable by SCOPEPROTECTION. 353 "Find all tags accessible by SCOPEPROTECTION.
354SCOPEPROTECTION is a symbol which can be returned by the method 354SCOPEPROTECTION is a symbol which can be returned by the method
355`semantic-tag-protection'. A hard-coded order is used to determine a match. 355`semantic-tag-protection'. A hard-coded order is used to determine a match.
356PARENT is a tag representing the PARENT slot needed for 356PARENT is a tag representing the PARENT slot needed for
@@ -383,7 +383,7 @@ See also `semantic-find-tags-by-name'."
383 ,name (semantic-flatten-tags-table ,table))) 383 ,name (semantic-flatten-tags-table ,table)))
384 384
385(defmacro semantic-deep-find-tags-for-completion (prefix &optional table) 385(defmacro semantic-deep-find-tags-for-completion (prefix &optional table)
386 "Find all tags whos name begins with PREFIX in TABLE. 386 "Find all tags whose name begins with PREFIX in TABLE.
387Search in top level tags, and their components, in TABLE. 387Search in top level tags, and their components, in TABLE.
388TABLE is a tag table. See `semantic-flatten-tags-table'. 388TABLE is a tag table. See `semantic-flatten-tags-table'.
389See also `semantic-find-tags-for-completion'." 389See also `semantic-find-tags-for-completion'."
diff --git a/lisp/cedet/semantic/format.el b/lisp/cedet/semantic/format.el
index 13945931b3f..446fe6c03db 100644
--- a/lisp/cedet/semantic/format.el
+++ b/lisp/cedet/semantic/format.el
@@ -1,7 +1,7 @@
1;;; semantic/format.el --- Routines for formatting tags 1;;; semantic/format.el --- Routines for formatting tags
2 2
3;;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007, 3;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008,
4;;; 2008, 2009 Free Software Foundation, Inc. 4;; 2009 Free Software Foundation, Inc.
5 5
6;; Author: Eric M. Ludlam <zappo@gnu.org> 6;; Author: Eric M. Ludlam <zappo@gnu.org>
7;; Keywords: syntax 7;; Keywords: syntax
@@ -71,7 +71,7 @@ COLOR indicates that the generated text should be colored using
71 (mapcar (lambda (f) (list 'const f)) 71 (mapcar (lambda (f) (list 'const f))
72 semantic-format-tag-functions) 72 semantic-format-tag-functions)
73 '(function)) 73 '(function))
74 "A List used by customizeable variables to choose a tag to text function. 74 "A List used by customizable variables to choose a tag to text function.
75Use this variable in the :type field of a customizable variable.") 75Use this variable in the :type field of a customizable variable.")
76 76
77(defcustom semantic-format-use-images-flag ezimage-use-images 77(defcustom semantic-format-use-images-flag ezimage-use-images
@@ -304,7 +304,7 @@ Optional argument COLOR means highlight the prototype with font-lock colors.")
304 304
305(defun semantic-format-tag-canonical-name-default (tag &optional parent color) 305(defun semantic-format-tag-canonical-name-default (tag &optional parent color)
306 "Return a canonical name for TAG. 306 "Return a canonical name for TAG.
307A canonical name includes the names of any parents or namespaces preceeding 307A canonical name includes the names of any parents or namespaces preceding
308the tag with colons separating them. 308the tag with colons separating them.
309Optional argument PARENT is the parent type if TAG is a detail. 309Optional argument PARENT is the parent type if TAG is a detail.
310Optional argument COLOR means highlight the prototype with font-lock colors." 310Optional argument COLOR means highlight the prototype with font-lock colors."
diff --git a/lisp/cedet/semantic/grammar-wy.el b/lisp/cedet/semantic/grammar-wy.el
index 4f70623ea07..36bb13a7424 100644
--- a/lisp/cedet/semantic/grammar-wy.el
+++ b/lisp/cedet/semantic/grammar-wy.el
@@ -340,7 +340,7 @@
340 (cond 340 (cond
341 ((vectorp elt) 341 ((vectorp elt)
342 (if prec 342 (if prec
343 (error "duplicate %%prec in `%s:%d' rule" nterm rindx)) 343 (error "Duplicate %%prec in `%s:%d' rule" nterm rindx))
344 (setq prec 344 (setq prec
345 (aref elt 0))) 345 (aref elt 0)))
346 ((consp elt) 346 ((consp elt)
diff --git a/lisp/cedet/semantic/grammar.el b/lisp/cedet/semantic/grammar.el
index f47275bdcf6..cbcdbcb4090 100644
--- a/lisp/cedet/semantic/grammar.el
+++ b/lisp/cedet/semantic/grammar.el
@@ -1,7 +1,7 @@
1;;; semantic/grammar.el --- Major mode framework for Semantic grammars 1;;; semantic/grammar.el --- Major mode framework for Semantic grammars
2 2
3;;; Copyright (C) 2002, 2003, 2004, 2005, 2007, 2008, 2009 3;; Copyright (C) 2002, 2003, 2004, 2005, 2007, 2008, 2009
4;;; Free Software Foundation, Inc. 4;; Free Software Foundation, Inc.
5 5
6;; Author: David Ponce <david@dponce.com> 6;; Author: David Ponce <david@dponce.com>
7;; Maintainer: David Ponce <david@dponce.com> 7;; Maintainer: David Ponce <david@dponce.com>
@@ -949,7 +949,7 @@ Lisp code."
949 output)) 949 output))
950 950
951(defun semantic-grammar-recreate-package () 951(defun semantic-grammar-recreate-package ()
952 "Unconditionnaly create Lisp code from grammar in current buffer. 952 "Unconditionally create Lisp code from grammar in current buffer.
953Like \\[universal-argument] \\[semantic-grammar-create-package]." 953Like \\[universal-argument] \\[semantic-grammar-create-package]."
954 (interactive) 954 (interactive)
955 (semantic-grammar-create-package t)) 955 (semantic-grammar-create-package t))
@@ -1537,7 +1537,7 @@ library found in DEF."
1537 (list mac lib)))) 1537 (list mac lib))))
1538 1538
1539(defun semantic--grammar-macro-compl-dict () 1539(defun semantic--grammar-macro-compl-dict ()
1540 "Return a completion dictionnary of macro definitions." 1540 "Return a completion dictionary of macro definitions."
1541 (let ((defs (semantic-grammar-macros)) 1541 (let ((defs (semantic-grammar-macros))
1542 def dups dict) 1542 def dups dict)
1543 (while defs 1543 (while defs
diff --git a/lisp/cedet/semantic/idle.el b/lisp/cedet/semantic/idle.el
index 02170154298..f10131579b3 100644
--- a/lisp/cedet/semantic/idle.el
+++ b/lisp/cedet/semantic/idle.el
@@ -1,7 +1,7 @@
1;;; idle.el --- Schedule parsing tasks in idle time 1;;; idle.el --- Schedule parsing tasks in idle time
2 2
3;;; Copyright (C) 2003, 2004, 2005, 2006, 2008, 2009 3;; Copyright (C) 2003, 2004, 2005, 2006, 2008, 2009
4;;; Free Software Foundation, Inc. 4;; Free Software Foundation, Inc.
5 5
6;; Author: Eric M. Ludlam <zappo@gnu.org> 6;; Author: Eric M. Ludlam <zappo@gnu.org>
7;; Keywords: syntax 7;; Keywords: syntax
@@ -714,7 +714,7 @@ If semanticdb is not in use, use the current buffer only."
714(defun semantic-idle-summary-current-symbol-info-brutish () 714(defun semantic-idle-summary-current-symbol-info-brutish ()
715 "Return a string message describing the current context. 715 "Return a string message describing the current context.
716Gets a symbol with `semantic-ctxt-current-thing' and then 716Gets a symbol with `semantic-ctxt-current-thing' and then
717trys to find it with a deep targetted search." 717tries to find it with a deep targeted search."
718 ;; Try the current "thing". 718 ;; Try the current "thing".
719 (let ((sym (car (semantic-ctxt-current-thing)))) 719 (let ((sym (car (semantic-ctxt-current-thing))))
720 (when sym 720 (when sym
@@ -740,7 +740,7 @@ Use the semantic analyzer to find the symbol information."
740 740
741(defun semantic-idle-summary-current-symbol-info-default () 741(defun semantic-idle-summary-current-symbol-info-default ()
742 "Return a string message describing the current context. 742 "Return a string message describing the current context.
743This functin will disable loading of previously unloaded files 743This function will disable loading of previously unloaded files
744by semanticdb as a time-saving measure." 744by semanticdb as a time-saving measure."
745 (let ( 745 (let (
746 (semanticdb-find-default-throttle 746 (semanticdb-find-default-throttle
diff --git a/lisp/cedet/semantic/lex-spp.el b/lisp/cedet/semantic/lex-spp.el
index edd377f2ab4..335a976e024 100644
--- a/lisp/cedet/semantic/lex-spp.el
+++ b/lisp/cedet/semantic/lex-spp.el
@@ -1,6 +1,6 @@
1;;; lex-spp.el --- Semantic Lexical Pre-processor 1;;; lex-spp.el --- Semantic Lexical Pre-processor
2 2
3;;; Copyright (C) 2006, 2007, 2008, 2009 Free Software Foundation, Inc. 3;; Copyright (C) 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
4 4
5;; Author: Eric M. Ludlam <zappo@gnu.org> 5;; Author: Eric M. Ludlam <zappo@gnu.org>
6 6
@@ -91,7 +91,7 @@ added and removed from this symbol table.")
91(make-variable-buffer-local 'semantic-lex-spp-dynamic-macro-symbol-obarray) 91(make-variable-buffer-local 'semantic-lex-spp-dynamic-macro-symbol-obarray)
92 92
93(defvar semantic-lex-spp-dynamic-macro-symbol-obarray-stack nil 93(defvar semantic-lex-spp-dynamic-macro-symbol-obarray-stack nil
94 "A stack of obarrays for temporarilly scoped macro values.") 94 "A stack of obarrays for temporarily scoped macro values.")
95(make-variable-buffer-local 'semantic-lex-spp-dynamic-macro-symbol-obarray-stack) 95(make-variable-buffer-local 'semantic-lex-spp-dynamic-macro-symbol-obarray-stack)
96 96
97(defvar semantic-lex-spp-expanded-macro-stack nil 97(defvar semantic-lex-spp-expanded-macro-stack nil
@@ -133,7 +133,7 @@ currently being expanded."
133;; 133;;
134(defsubst semantic-lex-spp-symbol (name) 134(defsubst semantic-lex-spp-symbol (name)
135 "Return spp symbol with NAME or nil if not found. 135 "Return spp symbol with NAME or nil if not found.
136The searcy priority is: 136The search priority is:
137 1. DYNAMIC symbols 137 1. DYNAMIC symbols
138 2. PROJECT specified symbols. 138 2. PROJECT specified symbols.
139 3. SYSTEM specified symbols." 139 3. SYSTEM specified symbols."
@@ -383,7 +383,7 @@ ARGVALUES are values for any arg list, or nil."
383If TOK is made of multiple tokens, convert those to text. This 383If TOK is made of multiple tokens, convert those to text. This
384conversion is needed if a macro has a merge symbol in it that 384conversion is needed if a macro has a merge symbol in it that
385combines the text of two previously distinct symbols. For 385combines the text of two previously distinct symbols. For
386exampe, in c: 386example, in c:
387 387
388#define (a,b) a ## b; 388#define (a,b) a ## b;
389 389
diff --git a/lisp/cedet/semantic/lex.el b/lisp/cedet/semantic/lex.el
index eb6d46df473..10693882627 100644
--- a/lisp/cedet/semantic/lex.el
+++ b/lisp/cedet/semantic/lex.el
@@ -1,7 +1,7 @@
1;;; semantic/lex.el --- Lexical Analyzer builder 1;;; semantic/lex.el --- Lexical Analyzer builder
2 2
3;;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 3;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
4;;; 2007, 2008, 2009 Free Software Foundation, Inc. 4;; 2008, 2009 Free Software Foundation, Inc.
5 5
6;; Author: Eric M. Ludlam <zappo@gnu.org> 6;; Author: Eric M. Ludlam <zappo@gnu.org>
7 7
@@ -41,12 +41,12 @@
41;; the lexical analysis. 41;; the lexical analysis.
42;; 42;;
43;; In the lexical analyzer created with `define-lex', each condition 43;; In the lexical analyzer created with `define-lex', each condition
44;; is tested for a given point. When the conditin is true, the forms 44;; is tested for a given point. When the condition is true, the forms
45;; run. 45;; run.
46;; 46;;
47;; The forms can push a lexical token onto the token stream. The 47;; The forms can push a lexical token onto the token stream. The
48;; analyzer forms also must move the current analyzer point. If the 48;; analyzer forms also must move the current analyzer point. If the
49;; analyzer point is moved without pushing a token, then tne matched 49;; analyzer point is moved without pushing a token, then the matched
50;; syntax is effectively ignored, or skipped. 50;; syntax is effectively ignored, or skipped.
51;; 51;;
52;; Thus, starting at the beginning of a region to be analyzed, each 52;; Thus, starting at the beginning of a region to be analyzed, each
@@ -61,7 +61,7 @@
61;; 61;;
62;; The `define-lex' macro accepts a list of lexical analyzers. Each 62;; The `define-lex' macro accepts a list of lexical analyzers. Each
63;; analyzer is created with `define-lex-analyzer', or one of the 63;; analyzer is created with `define-lex-analyzer', or one of the
64;; derivitive macros. A single analyzer defines a regular expression 64;; derivative macros. A single analyzer defines a regular expression
65;; to match text in a buffer, and a short segment of code to create 65;; to match text in a buffer, and a short segment of code to create
66;; one lexical token. 66;; one lexical token.
67;; 67;;
@@ -105,7 +105,7 @@
105;; Keywords are used by `semantic-lex-symbol-or-keyword' 105;; Keywords are used by `semantic-lex-symbol-or-keyword'
106;; to create lexical tokens based on the keyword. 106;; to create lexical tokens based on the keyword.
107;; 107;;
108;; Lexical type table - A table of symbols declared in a grammer 108;; Lexical type table - A table of symbols declared in a grammar
109;; file with the %type declaration. 109;; file with the %type declaration.
110;; The grammar compiler uses the type table to create new 110;; The grammar compiler uses the type table to create new
111;; lexical analyzers. These analyzers are then used to when 111;; lexical analyzers. These analyzers are then used to when
@@ -115,10 +115,10 @@
115;; 115;;
116;; A lexical type defines a kind of lexical analyzer that will be 116;; A lexical type defines a kind of lexical analyzer that will be
117;; automatically generated from a grammar file based on some 117;; automatically generated from a grammar file based on some
118;; predetermined attributes. For now these two attributes are 118;; predetermined attributes. For now these two attributes are
119;; recognized : 119;; recognized :
120;; 120;;
121;; * matchdatatype : define the kind of lexical analyzer. That is : 121;; * matchdatatype : define the kind of lexical analyzer. That is :
122;; 122;;
123;; - regexp : define a regexp analyzer (see 123;; - regexp : define a regexp analyzer (see
124;; `define-lex-regex-type-analyzer') 124;; `define-lex-regex-type-analyzer')
@@ -136,7 +136,7 @@
136;; `define-lex-keyword-type-analyzer') 136;; `define-lex-keyword-type-analyzer')
137;; 137;;
138;; * syntax : define the syntax that matches a syntactic 138;; * syntax : define the syntax that matches a syntactic
139;; expression. When syntax is matched the corresponding type 139;; expression. When syntax is matched the corresponding type
140;; analyzer is entered and the resulting match data will be 140;; analyzer is entered and the resulting match data will be
141;; interpreted based on the kind of analyzer (see matchdatatype 141;; interpreted based on the kind of analyzer (see matchdatatype
142;; above). 142;; above).
@@ -576,7 +576,7 @@ See also `semantic-lex-syntax-modifications'.")
576(defvar semantic-lex-comment-regex nil 576(defvar semantic-lex-comment-regex nil
577 "Regular expression for identifying comment start during lexical analysis. 577 "Regular expression for identifying comment start during lexical analysis.
578This may be automatically set when semantic initializes in a mode, but 578This may be automatically set when semantic initializes in a mode, but
579may need to be overriden for some special languages.") 579may need to be overridden for some special languages.")
580(make-variable-buffer-local 'semantic-lex-comment-regex) 580(make-variable-buffer-local 'semantic-lex-comment-regex)
581 581
582(defvar semantic-lex-number-expression 582(defvar semantic-lex-number-expression
@@ -730,7 +730,7 @@ Argument ANALYZERS is the list of analyzers being used."
730 "The current depth as tracked through lexical functions.") 730 "The current depth as tracked through lexical functions.")
731 731
732(defvar semantic-lex-maximum-depth nil 732(defvar semantic-lex-maximum-depth nil
733 "The maximum depth of parenthisis as tracked through lexical functions.") 733 "The maximum depth of parenthesis as tracked through lexical functions.")
734 734
735(defvar semantic-lex-token-stream nil 735(defvar semantic-lex-token-stream nil
736 "The current token stream we are collecting.") 736 "The current token stream we are collecting.")
@@ -765,7 +765,7 @@ Each analyzer should be an analyzer created with `define-lex-analyzer'.
765Note: The order in which analyzers are listed is important. 765Note: The order in which analyzers are listed is important.
766If two analyzers can match the same text, it is important to order the 766If two analyzers can match the same text, it is important to order the
767analyzers so that the one you want to match first occurs first. For 767analyzers so that the one you want to match first occurs first. For
768example, it is good to put a numbe analyzer in front of a symbol 768example, it is good to put a number analyzer in front of a symbol
769analyzer which might mistake a number for as a symbol." 769analyzer which might mistake a number for as a symbol."
770 `(defun ,name (start end &optional depth length) 770 `(defun ,name (start end &optional depth length)
771 ,(concat doc "\nSee `semantic-lex' for more information.") 771 ,(concat doc "\nSee `semantic-lex' for more information.")
@@ -897,7 +897,7 @@ The collapsed tokens are saved in `semantic-lex-block-streams'."
897 "Create a lexical token. 897 "Create a lexical token.
898SYMBOL is a symbol representing the class of syntax found. 898SYMBOL is a symbol representing the class of syntax found.
899START and END define the bounds of the token in the current buffer. 899START and END define the bounds of the token in the current buffer.
900Optional STR is the string for the token iff the the bounds 900Optional STR is the string for the token only if the the bounds
901in the buffer do not cover the string they represent. (As from 901in the buffer do not cover the string they represent. (As from
902macro expansion.)" 902macro expansion.)"
903 ;; This if statement checks the existance of a STR argument at 903 ;; This if statement checks the existance of a STR argument at
@@ -1066,7 +1066,7 @@ Only in effect if `debug-on-error' is also non-nil."
1066 "For SYNTAX, execute FORMS with protection for unterminated syntax. 1066 "For SYNTAX, execute FORMS with protection for unterminated syntax.
1067If FORMS throws an error, treat this as a syntax problem, and 1067If FORMS throws an error, treat this as a syntax problem, and
1068execute the unterminated syntax code. FORMS should return a position. 1068execute the unterminated syntax code. FORMS should return a position.
1069Irreguardless of an error, the cursor should be moved to the end of 1069Irregardless of an error, the cursor should be moved to the end of
1070the desired syntax, and a position returned. 1070the desired syntax, and a position returned.
1071If `debug-on-error' is set, errors are not caught, so that you can 1071If `debug-on-error' is set, errors are not caught, so that you can
1072debug them. 1072debug them.
@@ -1093,7 +1093,7 @@ While forms are running, the following variables will be locally bound:
1093 `semantic-lex-maximum-depth' - The maximum depth of semantic-list 1093 `semantic-lex-maximum-depth' - The maximum depth of semantic-list
1094 for the current analysis. 1094 for the current analysis.
1095 `semantic-lex-current-depth' - The current depth of `semantic-list' that has 1095 `semantic-lex-current-depth' - The current depth of `semantic-list' that has
1096 been decended. 1096 been descended.
1097 `semantic-lex-end-point' - End Point after match. 1097 `semantic-lex-end-point' - End Point after match.
1098 Analyzers should set this to a buffer location if their 1098 Analyzers should set this to a buffer location if their
1099 match string does not represent the end of the matched text. 1099 match string does not represent the end of the matched text.
diff --git a/lisp/cedet/semantic/sb.el b/lisp/cedet/semantic/sb.el
index b7e85ba8387..7a943815afd 100644
--- a/lisp/cedet/semantic/sb.el
+++ b/lisp/cedet/semantic/sb.el
@@ -40,7 +40,7 @@
40 40
41(defcustom semantic-sb-autoexpand-length 1 41(defcustom semantic-sb-autoexpand-length 1
42 "*Length of a semantic bucket to autoexpand in place. 42 "*Length of a semantic bucket to autoexpand in place.
43This will replace the named bucket that would have usually occured here." 43This will replace the named bucket that would have usually occurred here."
44 :group 'speedbar 44 :group 'speedbar
45 :type 'integer) 45 :type 'integer)
46 46
diff --git a/lisp/cedet/semantic/scope.el b/lisp/cedet/semantic/scope.el
index 30b394d4a07..1a077c79c63 100644
--- a/lisp/cedet/semantic/scope.el
+++ b/lisp/cedet/semantic/scope.el
@@ -24,7 +24,7 @@
24;; Calculate information about the current scope. 24;; Calculate information about the current scope.
25;; 25;;
26;; Manages the current scope as a structure that can be cached on a 26;; Manages the current scope as a structure that can be cached on a
27;; per-file basis and recycled between different occurances of 27;; per-file basis and recycled between different occurrences of
28;; analysis on different parts of a file. 28;; analysis on different parts of a file.
29;; 29;;
30;; Pattern for Scope Calculation 30;; Pattern for Scope Calculation
@@ -388,7 +388,7 @@ without use of \"object.function()\" style syntax due to an
388implicit \"object\".") 388implicit \"object\".")
389 389
390(defun semantic-analyze-scoped-tags-default (typelist halfscope) 390(defun semantic-analyze-scoped-tags-default (typelist halfscope)
391 "Return accessable tags when TYPELIST and HALFSCOPE is in scope. 391 "Return accessible tags when TYPELIST and HALFSCOPE is in scope.
392HALFSCOPE is the current scope partially initialized. 392HALFSCOPE is the current scope partially initialized.
393Tags returned are not in the global name space, but are instead 393Tags returned are not in the global name space, but are instead
394scoped inside a class or namespace. Such items can be referenced 394scoped inside a class or namespace. Such items can be referenced
@@ -556,8 +556,8 @@ PROTECTION specifies the type of access requested, such as 'public or 'private."
556Argument SCOPE specify additional tags that are in scope 556Argument SCOPE specify additional tags that are in scope
557whose tags can be searched when needed, OR it may be a scope object. 557whose tags can be searched when needed, OR it may be a scope object.
558ACCESS is the level of access we filter on child supplied tags. 558ACCESS is the level of access we filter on child supplied tags.
559For langauges with protection on specific methods or slots, 559For languages with protection on specific methods or slots,
560it should strip out those not accessable by methods of TYPE. 560it should strip out those not accessible by methods of TYPE.
561An ACCESS of 'public means not in a method of a subclass of type. 561An ACCESS of 'public means not in a method of a subclass of type.
562A value of 'private means we can access private parts of the originating 562A value of 'private means we can access private parts of the originating
563type." 563type."
@@ -733,7 +733,7 @@ The class returned from the scope calculation is variable
733 scopecache)))) 733 scopecache))))
734 734
735(defun semantic-scope-find (name &optional class scope-in) 735(defun semantic-scope-find (name &optional class scope-in)
736 "Find the tag with NAME, and optinal CLASS in the current SCOPE-IN. 736 "Find the tag with NAME, and optional CLASS in the current SCOPE-IN.
737Searches various elements of the scope for NAME. Return ALL the 737Searches various elements of the scope for NAME. Return ALL the
738hits in order, with the first tag being in the closest scope." 738hits in order, with the first tag being in the closest scope."
739 (let ((scope (or scope-in (semantic-calculate-scope))) 739 (let ((scope (or scope-in (semantic-calculate-scope)))
diff --git a/lisp/cedet/semantic/senator.el b/lisp/cedet/semantic/senator.el
index 41735f9c6c7..cae6a53e673 100644
--- a/lisp/cedet/semantic/senator.el
+++ b/lisp/cedet/semantic/senator.el
@@ -1,7 +1,7 @@
1;;; semantic/senator.el --- SEmantic NAvigaTOR 1;;; semantic/senator.el --- SEmantic NAvigaTOR
2 2
3;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 3;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
4;; 2009 Free Software Foundation, Inc. 4;; 2009 Free Software Foundation, Inc.
5 5
6;; Author: David Ponce <david@dponce.com> 6;; Author: David Ponce <david@dponce.com>
7;; Maintainer: FSF 7;; Maintainer: FSF
@@ -208,7 +208,7 @@ Ignore tags of classes in `senator-search-ignore-tag-classes'"
208(defvar senator-search-tag-filter-functions 208(defvar senator-search-tag-filter-functions
209 '(senator-search-default-tag-filter) 209 '(senator-search-default-tag-filter)
210 "List of functions to be called to filter searched tags. 210 "List of functions to be called to filter searched tags.
211Each function is passed a tag. If one of them returns nil, the tag is 211Each function is passed a tag. If one of them returns nil, the tag is
212excluded from the search.") 212excluded from the search.")
213 213
214(defun senator-search (searcher text &optional bound noerror count) 214(defun senator-search (searcher text &optional bound noerror count)
@@ -413,7 +413,7 @@ NOERROR and COUNT arguments."
413 (error "No previous search")))) 413 (error "No previous search"))))
414 414
415(defun senator-nonincremental-search-forward (string) 415(defun senator-nonincremental-search-forward (string)
416 "Search for STRING nonincrementally." 416 "Search for STRING nonincrementally."
417 (interactive "sSemantic search for string: ") 417 (interactive "sSemantic search for string: ")
418 (setq senator-last-search-type 'string) 418 (setq senator-last-search-type 'string)
419 (if (equal string "") 419 (if (equal string "")
@@ -544,7 +544,7 @@ Some tags such as includes have other reference features."
544 (error "Unknown result type from `semantic-up-reference'")))))) 544 (error "Unknown result type from `semantic-up-reference'"))))))
545 545
546(defun semantic-up-reference-default (tag) 546(defun semantic-up-reference-default (tag)
547 "Return a tag that is referredto by TAG. 547 "Return a tag that is referred to by TAG.
548Makes C/C++ language like assumptions." 548Makes C/C++ language like assumptions."
549 (cond ((semantic-tag-faux-p tag) 549 (cond ((semantic-tag-faux-p tag)
550 ;; Faux tags should have a real tag in some other location. 550 ;; Faux tags should have a real tag in some other location.
@@ -707,7 +707,7 @@ the kill ring. Retrieve that text with \\[yank]."
707;;;###autoload 707;;;###autoload
708(defun senator-yank-tag () 708(defun senator-yank-tag ()
709 "Yank a tag from the tag ring. 709 "Yank a tag from the tag ring.
710The form the tag takes is differnet depending on where it is being 710The form the tag takes is different depending on where it is being
711yanked to." 711yanked to."
712 (interactive) 712 (interactive)
713 (or (ring-empty-p senator-tag-ring) 713 (or (ring-empty-p senator-tag-ring)
@@ -735,7 +735,7 @@ kill ring."
735 735
736;;;###autoload 736;;;###autoload
737(defun senator-transpose-tags-up () 737(defun senator-transpose-tags-up ()
738 "Transpose the current tag, and the preceeding tag." 738 "Transpose the current tag, and the preceding tag."
739 (interactive) 739 (interactive)
740 (semantic-fetch-tags) 740 (semantic-fetch-tags)
741 (let* ((current-tag (semantic-current-tag)) 741 (let* ((current-tag (semantic-current-tag))
diff --git a/lisp/cedet/semantic/symref.el b/lisp/cedet/semantic/symref.el
index bea148b1c21..2022ce82fc1 100644
--- a/lisp/cedet/semantic/symref.el
+++ b/lisp/cedet/semantic/symref.el
@@ -1,6 +1,6 @@
1;;; semantic/symref.el --- Symbol Reference API 1;;; semantic/symref.el --- Symbol Reference API
2 2
3;;; Copyright (C) 2008, 2009 Free Software Foundation, Inc. 3;; Copyright (C) 2008, 2009 Free Software Foundation, Inc.
4 4
5;; Author: Eric M. Ludlam <eric@siege-engine.com> 5;; Author: Eric M. Ludlam <eric@siege-engine.com>
6 6
@@ -25,7 +25,7 @@
25;; 25;;
26;; Semantic's native parsing tools do not handle symbol references. 26;; Semantic's native parsing tools do not handle symbol references.
27;; Tracking such information is a task that requires a huge amount of 27;; Tracking such information is a task that requires a huge amount of
28;; space and processing not apropriate for an Emacs Lisp program. 28;; space and processing not appropriate for an Emacs Lisp program.
29;; 29;;
30;; Many desired tools used in refactoring, however, need to have 30;; Many desired tools used in refactoring, however, need to have
31;; such references available to them. This API aims to provide a 31;; such references available to them. This API aims to provide a
@@ -58,7 +58,7 @@
58;; 58;;
59;; ADD A NEW EXTERNAL TOOL 59;; ADD A NEW EXTERNAL TOOL
60;; 60;;
61;; To support a new external tool, sublcass `semantic-symref-tool-baseclass' 61;; To support a new external tool, subclass `semantic-symref-tool-baseclass'
62;; and implement the methods. The baseclass provides support for 62;; and implement the methods. The baseclass provides support for
63;; managing external processes that produce parsable output. 63;; managing external processes that produce parsable output.
64;; 64;;
@@ -253,7 +253,7 @@ Returns an object of class `semantic-symref-result'."
253 253
254;;;###autoload 254;;;###autoload
255(defun semantic-symref-find-text (text &optional scope) 255(defun semantic-symref-find-text (text &optional scope)
256 "Find a list of occurances of TEXT in the current project. 256 "Find a list of occurrences of TEXT in the current project.
257TEXT is a regexp formatted for use with egrep. 257TEXT is a regexp formatted for use with egrep.
258Optional SCOPE specifies which file set to search. Defaults to 'project. 258Optional SCOPE specifies which file set to search. Defaults to 'project.
259Refers to `semantic-symref-tool', to determine the reference tool to use 259Refers to `semantic-symref-tool', to determine the reference tool to use
diff --git a/lisp/cedet/semantic/symref/filter.el b/lisp/cedet/semantic/symref/filter.el
index 97e5c92a6ab..2b12fd7253d 100644
--- a/lisp/cedet/semantic/symref/filter.el
+++ b/lisp/cedet/semantic/symref/filter.el
@@ -1,6 +1,6 @@
1;;; semantic/symref/filter.el --- Filter symbol reference hits for accuracy. 1;;; semantic/symref/filter.el --- Filter symbol reference hits for accuracy.
2 2
3;;; Copyright (C) 2009 Free Software Foundation, Inc. 3;; Copyright (C) 2009 Free Software Foundation, Inc.
4 4
5;; Author: Eric M. Ludlam <eric@siege-engine.com> 5;; Author: Eric M. Ludlam <eric@siege-engine.com>
6 6
@@ -60,10 +60,10 @@ Return non-nil for a match."
60;; a symref results object. 60;; a symref results object.
61 61
62(defun semantic-symref-hits-in-region (target hookfcn start end) 62(defun semantic-symref-hits-in-region (target hookfcn start end)
63 "Find all occurances of the symbol TARGET that match TARGET the tag. 63 "Find all occurrences of the symbol TARGET that match TARGET the tag.
64For each match, call HOOKFCN. 64For each match, call HOOKFCN.
65HOOKFCN takes three arguments that match 65HOOKFCN takes three arguments that match
66`semantic-analyze-current-symbol's use of HOOKfCN. 66`semantic-analyze-current-symbol's use of HOOKFCN.
67 ( START END PREFIX ) 67 ( START END PREFIX )
68 68
69Search occurs in the current buffer between START and END." 69Search occurs in the current buffer between START and END."
diff --git a/lisp/cedet/semantic/symref/grep.el b/lisp/cedet/semantic/symref/grep.el
index 3033a41faaf..bd9e731c722 100644
--- a/lisp/cedet/semantic/symref/grep.el
+++ b/lisp/cedet/semantic/symref/grep.el
@@ -1,6 +1,6 @@
1;;; semantic/symref/grep.el --- Symref implementation using find/grep 1;;; semantic/symref/grep.el --- Symref implementation using find/grep
2 2
3;;; Copyright (C) 2008, 2009 Free Software Foundation, Inc. 3;; Copyright (C) 2008, 2009 Free Software Foundation, Inc.
4 4
5;; Author: Eric M. Ludlam <eric@siege-engine.com> 5;; Author: Eric M. Ludlam <eric@siege-engine.com>
6 6
@@ -103,9 +103,9 @@ Optional argument MODE specifies the `major-mode' to test."
103(defun semantic-symref-grep-use-template (rootdir filepattern grepflags greppattern) 103(defun semantic-symref-grep-use-template (rootdir filepattern grepflags greppattern)
104 "Use the grep template expand feature to create a grep command. 104 "Use the grep template expand feature to create a grep command.
105ROOTDIR is the root location to run the `find' from. 105ROOTDIR is the root location to run the `find' from.
106FILEPATTERN is a string represeting find flags for searching file patterns. 106FILEPATTERN is a string representing find flags for searching file patterns.
107GREPFLAGS are flags passed to grep, such as -n or -l. 107GREPFLAGS are flags passed to grep, such as -n or -l.
108GREPPATTERN is the pattren used by grep." 108GREPPATTERN is the pattern used by grep."
109 ;; We have grep-compute-defaults. Lets use it. 109 ;; We have grep-compute-defaults. Lets use it.
110 (grep-compute-defaults) 110 (grep-compute-defaults)
111 (let* ((grep-expand-keywords semantic-symref-grep-expand-keywords) 111 (let* ((grep-expand-keywords semantic-symref-grep-expand-keywords)
diff --git a/lisp/cedet/semantic/symref/list.el b/lisp/cedet/semantic/symref/list.el
index ad1d471d69e..7351c73adfc 100644
--- a/lisp/cedet/semantic/symref/list.el
+++ b/lisp/cedet/semantic/symref/list.el
@@ -23,11 +23,11 @@
23;; 23;;
24;; Provide a simple user facing API to finding symbol references. 24;; Provide a simple user facing API to finding symbol references.
25;; 25;;
26;; This UI will is the base of some refactoring tools. For any 26;; This UI is the base of some refactoring tools. For any refactor,
27;; refactor, the user will execture `semantic-symref' in a tag. Once 27;; the user will execture [FIXME what?] `semantic-symref' in a tag.
28;; that data is collected, the output will be listed in a buffer. In 28;; Once that data is collected, the output will be listed in a buffer.
29;; the output buffer, the user can then initiate different refactoring 29;; In the output buffer, the user can then initiate different
30;; operations. 30;; refactoring operations.
31;; 31;;
32;; NOTE: Need to add some refactoring tools. 32;; NOTE: Need to add some refactoring tools.
33 33
@@ -41,10 +41,10 @@
41(defun semantic-symref () 41(defun semantic-symref ()
42 "Find references to the current tag. 42 "Find references to the current tag.
43This command uses the currently configured references tool within the 43This command uses the currently configured references tool within the
44current project to find references to the current tag. The 44current project to find references to the current tag. The
45references are the organized by file and the name of the function 45references are the organized by file and the name of the function
46they are used in. 46they are used in.
47Display the references in`semantic-symref-results-mode'" 47Display the references in`semantic-symref-results-mode'."
48 (interactive) 48 (interactive)
49 (semantic-fetch-tags) 49 (semantic-fetch-tags)
50 (let ((ct (semantic-current-tag)) 50 (let ((ct (semantic-current-tag))
@@ -67,7 +67,7 @@ This command uses the currently configured references tool within the
67current project to find references to the input SYM. The 67current project to find references to the input SYM. The
68references are the organized by file and the name of the function 68references are the organized by file and the name of the function
69they are used in. 69they are used in.
70Display the references in`semantic-symref-results-mode'" 70Display the references in`semantic-symref-results-mode'."
71 (interactive (list (semantic-tag-name (semantic-complete-read-tag-buffer-deep 71 (interactive (list (semantic-tag-name (semantic-complete-read-tag-buffer-deep
72 "Symrefs for: ")))) 72 "Symrefs for: "))))
73 (semantic-fetch-tags) 73 (semantic-fetch-tags)
@@ -141,7 +141,7 @@ RESULTS is an object of class `semantic-symref-results'."
141 ) 141 )
142 142
143(defun semantic-symref-hide-buffer () 143(defun semantic-symref-hide-buffer ()
144 "Hide buffer with sematinc-symref results" 144 "Hide buffer with semantic-symref results."
145 (interactive) 145 (interactive)
146 (bury-buffer)) 146 (bury-buffer))
147 147
diff --git a/lisp/cedet/semantic/tag.el b/lisp/cedet/semantic/tag.el
index 608f4f403ee..1dfd3b8e872 100644
--- a/lisp/cedet/semantic/tag.el
+++ b/lisp/cedet/semantic/tag.el
@@ -1,7 +1,7 @@
1;;; semantic/tag.el --- tag creation and access 1;;; semantic/tag.el --- tag creation and access
2 2
3;;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007, 3;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008,
4;;; 2008, 2009 Free Software Foundation, Inc. 4;; 2009 Free Software Foundation, Inc.
5 5
6;; Author: Eric M. Ludlam <zappo@gnu.org> 6;; Author: Eric M. Ludlam <zappo@gnu.org>
7 7
@@ -39,7 +39,7 @@
39;; II. There is also an API for tag creation. Use `semantic-tag' to create 39;; II. There is also an API for tag creation. Use `semantic-tag' to create
40;; a new tag. 40;; a new tag.
41;; 41;;
42;; III. Tag Comparison. Allows explicit or comparitive tests to see 42;; III. Tag Comparison. Allows explicit or comparative tests to see
43;; if two tags are the same. 43;; if two tags are the same.
44 44
45;;; Code: 45;;; Code:
@@ -111,7 +111,7 @@ A variable, or named storage for data.
111@item include 111@item include
112Statement that represents a file from which more tags can be found. 112Statement that represents a file from which more tags can be found.
113@item package 113@item package
114Statement that declairs this file's package name. 114Statement that declares this file's package name.
115@item code 115@item code
116Code that has not name or binding to any other symbol, such as in a script. 116Code that has not name or binding to any other symbol, such as in a script.
117@end table 117@end table
@@ -528,8 +528,9 @@ ATTRIBUTES is a list of additional attributes belonging to this tag."
528 "Create a semantic tag of class 'variable. 528 "Create a semantic tag of class 'variable.
529NAME is the name of this variable. 529NAME is the name of this variable.
530TYPE is a string or semantic tag representing the type of this variable. 530TYPE is a string or semantic tag representing the type of this variable.
531Optional DEFAULT-VALUE is a string representing the default value of this variable. 531Optional DEFAULT-VALUE is a string representing the default value of this
532ATTRIBUTES is a list of additional attributes belonging to this tag." 532variable. ATTRIBUTES is a list of additional attributes belonging to this
533tag."
533 (apply 'semantic-tag name 'variable 534 (apply 'semantic-tag name 'variable
534 :type type 535 :type type
535 :default-value default-value 536 :default-value default-value
@@ -631,7 +632,7 @@ copied tag.
631If optional argument KEEP-FILE is non-nil, and TAG was linked to a 632If optional argument KEEP-FILE is non-nil, and TAG was linked to a
632buffer, the originating buffer file name is kept in the `:filename' 633buffer, the originating buffer file name is kept in the `:filename'
633property of the copied tag. 634property of the copied tag.
634If KEEP-FILE is a string, and the orginating buffer is NOT available, 635If KEEP-FILE is a string, and the originating buffer is NOT available,
635then KEEP-FILE is stored on the `:filename' property. 636then KEEP-FILE is stored on the `:filename' property.
636This runs the tag hook `unlink-copy-hook`." 637This runs the tag hook `unlink-copy-hook`."
637 ;; Right now, TAG is a list. 638 ;; Right now, TAG is a list.
@@ -702,7 +703,7 @@ It is safe for FILTER to modify the input tag and return it."
702(defun semantic--tag-deep-copy-attributes (attrs &optional filter) 703(defun semantic--tag-deep-copy-attributes (attrs &optional filter)
703 "Make a deep copy of ATTRS, applying FILTER to each child-tag. 704 "Make a deep copy of ATTRS, applying FILTER to each child-tag.
704 705
705It is safe to modify ATTR, and return a permutaion of that list. 706It is safe to modify ATTR, and return a permutation of that list.
706 707
707FILTER takes TAG as an argument, and should returns a semantic-tag. 708FILTER takes TAG as an argument, and should returns a semantic-tag.
708It is safe for FILTER to modify the input tag and return it." 709It is safe for FILTER to modify the input tag and return it."
@@ -715,7 +716,7 @@ It is safe for FILTER to modify the input tag and return it."
715(defun semantic--tag-deep-copy-value (value &optional filter) 716(defun semantic--tag-deep-copy-value (value &optional filter)
716 "Make a deep copy of VALUE, applying FILTER to each child-tag. 717 "Make a deep copy of VALUE, applying FILTER to each child-tag.
717 718
718It is safe to modify VALUE, and return a permutaion of that list. 719It is safe to modify VALUE, and return a permutation of that list.
719 720
720FILTER takes TAG as an argument, and should returns a semantic-tag. 721FILTER takes TAG as an argument, and should returns a semantic-tag.
721It is safe for FILTER to modify the input tag and return it." 722It is safe for FILTER to modify the input tag and return it."
@@ -734,7 +735,7 @@ It is safe for FILTER to modify the input tag and return it."
734(defun semantic--tag-deep-copy-tag-list (tags &optional filter) 735(defun semantic--tag-deep-copy-tag-list (tags &optional filter)
735 "Make a deep copy of TAGS, applying FILTER to each child-tag. 736 "Make a deep copy of TAGS, applying FILTER to each child-tag.
736 737
737It is safe to modify the TAGS list, and return a permutaion of that list. 738It is safe to modify the TAGS list, and return a permutation of that list.
738 739
739FILTER takes TAG as an argument, and should returns a semantic-tag. 740FILTER takes TAG as an argument, and should returns a semantic-tag.
740It is safe for FILTER to modify the input tag and return it." 741It is safe for FILTER to modify the input tag and return it."
@@ -994,7 +995,7 @@ Ignoring this step will prevent several features from working correctly."
994 "Return the list of top level components belonging to TAG. 995 "Return the list of top level components belonging to TAG.
995Children are any sub-tags which contain overlays. 996Children are any sub-tags which contain overlays.
996The default action collects regular components of TAG, in addition 997The default action collects regular components of TAG, in addition
997to any components beloning to an anonymous type." 998to any components belonging to an anonymous type."
998 (let ((explicit-children (semantic-tag-components tag)) 999 (let ((explicit-children (semantic-tag-components tag))
999 (type (semantic-tag-type tag)) 1000 (type (semantic-tag-type tag))
1000 (anon-type-children nil) 1001 (anon-type-children nil)
diff --git a/lisp/cedet/semantic/texi.el b/lisp/cedet/semantic/texi.el
index 5f00b1ab928..cdf416a5a30 100644
--- a/lisp/cedet/semantic/texi.el
+++ b/lisp/cedet/semantic/texi.el
@@ -1,7 +1,7 @@
1;;; semantic/texi.el --- Semantic details for Texinfo files 1;;; semantic/texi.el --- Semantic details for Texinfo files
2 2
3;;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2007, 2008, 2009 3;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2007, 2008, 2009
4;;; Free Software Foundation, Inc. 4;; Free Software Foundation, Inc.
5 5
6;; Author: Eric M. Ludlam <zappo@gnu.org> 6;; Author: Eric M. Ludlam <zappo@gnu.org>
7 7
@@ -252,7 +252,7 @@ The cursor should be on the @ sign."
252 "menu\\|" 252 "menu\\|"
253 (substring texinfo-environment-regexp 253 (substring texinfo-environment-regexp
254 (match-beginning 0))))) 254 (match-beginning 0)))))
255 "Regular expression for matching texinfo enviroments. 255 "Regular expression for matching texinfo environments.
256uses `texinfo-environment-regexp', but makes sure that it 256uses `texinfo-environment-regexp', but makes sure that it
257can handle the @menu environment.") 257can handle the @menu environment.")
258 258
diff --git a/lisp/cedet/semantic/util-modes.el b/lisp/cedet/semantic/util-modes.el
index 6b64287840e..8c7f54377d6 100644
--- a/lisp/cedet/semantic/util-modes.el
+++ b/lisp/cedet/semantic/util-modes.el
@@ -1,7 +1,7 @@
1;;; semantic/util-modes.el --- Semantic minor modes 1;;; semantic/util-modes.el --- Semantic minor modes
2 2
3;;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008, 2009 3;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008, 2009
4;;; Free Software Foundation, Inc. 4;; Free Software Foundation, Inc.
5 5
6;; Authors: Eric M. Ludlam <zappo@gnu.org> 6;; Authors: Eric M. Ludlam <zappo@gnu.org>
7;; David Ponce <david@dponce.com> 7;; David Ponce <david@dponce.com>
@@ -522,7 +522,7 @@ minor mode is enabled.
522(defcustom global-semantic-show-parser-state-mode nil 522(defcustom global-semantic-show-parser-state-mode nil
523 "If non-nil enable global use of `semantic-show-parser-state-mode'. 523 "If non-nil enable global use of `semantic-show-parser-state-mode'.
524When enabled, the current parse state of the current buffer is displayed 524When enabled, the current parse state of the current buffer is displayed
525in the mode line. See `semantic-show-parser-state-marker' for details 525in the mode line. See `semantic-show-parser-state-marker' for details
526on what is displayed." 526on what is displayed."
527 :group 'semantic 527 :group 'semantic
528 :type 'boolean 528 :type 'boolean
@@ -634,7 +634,7 @@ minor mode is enabled."
634(defun semantic-show-parser-state-mode (&optional arg) 634(defun semantic-show-parser-state-mode (&optional arg)
635 "Minor mode for displaying parser cache state in the modeline. 635 "Minor mode for displaying parser cache state in the modeline.
636The cache can be in one of three states. They are 636The cache can be in one of three states. They are
637Up to date, Partial reprase needed, and Full reparse needed. 637Up to date, Partial reparse needed, and Full reparse needed.
638The state is indicated in the modeline with the following characters: 638The state is indicated in the modeline with the following characters:
639 `-' -> The cache is up to date. 639 `-' -> The cache is up to date.
640 `!' -> The cache requires a full update. 640 `!' -> The cache requires a full update.
diff --git a/lisp/cedet/semantic/wisent.el b/lisp/cedet/semantic/wisent.el
index 73a0a1e42bd..6d7ef753b39 100644
--- a/lisp/cedet/semantic/wisent.el
+++ b/lisp/cedet/semantic/wisent.el
@@ -52,7 +52,7 @@ When non-nil it is directly returned by `wisent-lex-function'.")
52 52
53(defmacro wisent-lex-eoi () 53(defmacro wisent-lex-eoi ()
54 "Return an End-Of-Input lexical token. 54 "Return an End-Of-Input lexical token.
55The EOI token is like this: ($EOI "" POINT-MAX . POINT-MAX)." 55The EOI token is like this: ($EOI \"\" POINT-MAX . POINT-MAX)."
56 `(cons ',wisent-eoi-term 56 `(cons ',wisent-eoi-term
57 (cons "" 57 (cons ""
58 (cons (point-max) (point-max))))) 58 (cons (point-max) (point-max)))))