aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Engster2011-11-03 21:03:45 +0100
committerDavid Engster2011-11-03 21:03:45 +0100
commit07a79ce4b45709f043dae5b905fd3268a242e106 (patch)
tree1962a6a145c23b8f82b94e6446ae145dd3a034a1
parent3ccc1742ba32bf118c15d19b639032fbf503fcea (diff)
downloademacs-07a79ce4b45709f043dae5b905fd3268a242e106.tar.gz
emacs-07a79ce4b45709f043dae5b905fd3268a242e106.zip
* srecode.el:
* srecode/texi.el: * srecode/template.el: * srecode/java.el: * srecode/insert.el: * srecode/document.el: * srecode/dictionary.el: * srecode/compile.el: * semantic/wisent/java-tags.el: * semantic/texi.el: * semantic/sort.el: * semantic/lex-spp.el: * semantic/idle.el: * semantic/html.el: * semantic/db-typecache.el: * semantic/analyze/complete.el: * ede/generic.el: * ede/custom.el: * ede/cpp-root.el: * ede/base.el: Fix filenames in comments and headers. * semantic/db-find.el: * srecode/insert.el (srecode-insert-include-lookup): * ede/proj-comp.el (ede-compilation-program): Fix it's -> its in comments and docstrings. * semantic/ctxt.el (semantic-end-of-context-default): * semantic/find.el (semantic-find-tags-by-scope-protection): * semantic/java.el (semantic-documentation-for-tag): Fix typos in docstrings. * semantic/db.el (semanticdb-table, semanticdb-abstract-cache) (semanticdb-abstract-db-cache): * semantic/decorate/include.el (semantic-decoration-unknown-include-describe): Fix filenames in docstring. * semantic/ede-grammar.el (semantic-ede-grammar-compiler-wisent): (semantic-ede-grammar-compiler-bovine): Fix requires that are added to the grammar-make-script.
-rw-r--r--lisp/cedet/ChangeLog43
-rw-r--r--lisp/cedet/ede/base.el2
-rw-r--r--lisp/cedet/ede/cpp-root.el2
-rw-r--r--lisp/cedet/ede/custom.el2
-rw-r--r--lisp/cedet/ede/generic.el2
-rw-r--r--lisp/cedet/ede/proj-comp.el2
-rw-r--r--lisp/cedet/semantic/analyze/complete.el2
-rw-r--r--lisp/cedet/semantic/ctxt.el2
-rw-r--r--lisp/cedet/semantic/db-find.el4
-rw-r--r--lisp/cedet/semantic/db-typecache.el4
-rw-r--r--lisp/cedet/semantic/db.el6
-rw-r--r--lisp/cedet/semantic/decorate/include.el2
-rw-r--r--lisp/cedet/semantic/ede-grammar.el8
-rw-r--r--lisp/cedet/semantic/find.el2
-rw-r--r--lisp/cedet/semantic/html.el2
-rw-r--r--lisp/cedet/semantic/idle.el2
-rw-r--r--lisp/cedet/semantic/java.el2
-rw-r--r--lisp/cedet/semantic/lex-spp.el4
-rw-r--r--lisp/cedet/semantic/sort.el6
-rw-r--r--lisp/cedet/semantic/texi.el4
-rw-r--r--lisp/cedet/semantic/wisent/java-tags.el2
-rw-r--r--lisp/cedet/srecode.el2
-rw-r--r--lisp/cedet/srecode/compile.el2
-rw-r--r--lisp/cedet/srecode/dictionary.el2
-rw-r--r--lisp/cedet/srecode/document.el2
-rw-r--r--lisp/cedet/srecode/insert.el4
-rw-r--r--lisp/cedet/srecode/java.el2
-rw-r--r--lisp/cedet/srecode/template.el2
-rw-r--r--lisp/cedet/srecode/texi.el2
29 files changed, 83 insertions, 40 deletions
diff --git a/lisp/cedet/ChangeLog b/lisp/cedet/ChangeLog
index 3dd0e6f78fd..2dc345b45da 100644
--- a/lisp/cedet/ChangeLog
+++ b/lisp/cedet/ChangeLog
@@ -1,3 +1,46 @@
12011-11-03 David Engster <dengste@eml.cc>
2
3 * srecode.el:
4 * srecode/texi.el:
5 * srecode/template.el:
6 * srecode/java.el:
7 * srecode/insert.el:
8 * srecode/document.el:
9 * srecode/dictionary.el:
10 * srecode/compile.el:
11 * semantic/wisent/java-tags.el:
12 * semantic/texi.el:
13 * semantic/sort.el:
14 * semantic/lex-spp.el:
15 * semantic/idle.el:
16 * semantic/html.el:
17 * semantic/db-typecache.el:
18 * semantic/analyze/complete.el:
19 * ede/generic.el:
20 * ede/custom.el:
21 * ede/cpp-root.el:
22 * ede/base.el: Fix filenames in comments and headers.
23
24 * semantic/db-find.el:
25 * srecode/insert.el (srecode-insert-include-lookup):
26 * ede/proj-comp.el (ede-compilation-program): Fix it's -> its in
27 comments and docstrings.
28
29 * semantic/ctxt.el (semantic-end-of-context-default):
30 * semantic/find.el (semantic-find-tags-by-scope-protection):
31 * semantic/java.el (semantic-documentation-for-tag): Fix typos in
32 docstrings.
33
34 * semantic/db.el (semanticdb-table, semanticdb-abstract-cache)
35 (semanticdb-abstract-db-cache):
36 * semantic/decorate/include.el
37 (semantic-decoration-unknown-include-describe): Fix filenames in
38 docstring.
39
40 * semantic/ede-grammar.el (semantic-ede-grammar-compiler-wisent):
41 (semantic-ede-grammar-compiler-bovine): Fix requires that are
42 added to the grammar-make-script.
43
12011-10-23 Chong Yidong <cyd@gnu.org> 442011-10-23 Chong Yidong <cyd@gnu.org>
2 45
3 * ede.el (ede-maybe-checkout): Function deleted; 46 * ede.el (ede-maybe-checkout): Function deleted;
diff --git a/lisp/cedet/ede/base.el b/lisp/cedet/ede/base.el
index da36919b23a..8b0bd261daf 100644
--- a/lisp/cedet/ede/base.el
+++ b/lisp/cedet/ede/base.el
@@ -413,7 +413,7 @@ Specifying PARENT is useful for sub-sub projects relative to the root project."
413(defmethod ede-subproject-p ((proj ede-project)) 413(defmethod ede-subproject-p ((proj ede-project))
414 "Return non-nil if PROJ is a sub project." 414 "Return non-nil if PROJ is a sub project."
415 ;; @TODO - Use this in more places, and also pay attention to 415 ;; @TODO - Use this in more places, and also pay attention to
416 ;; metasubproject in ede-proj.el 416 ;; metasubproject in ede/proj.el
417 (ede-parent-project proj)) 417 (ede-parent-project proj))
418 418
419 419
diff --git a/lisp/cedet/ede/cpp-root.el b/lisp/cedet/ede/cpp-root.el
index 7586522355e..e4d1bf205ec 100644
--- a/lisp/cedet/ede/cpp-root.el
+++ b/lisp/cedet/ede/cpp-root.el
@@ -21,7 +21,7 @@
21 21
22;;; Commentary: 22;;; Commentary:
23;; 23;;
24;; NOTE: ede-cpp-root.el has been commented so as to also make it 24;; NOTE: ede/cpp-root.el has been commented so as to also make it
25;; useful for learning how to make similar project types. 25;; useful for learning how to make similar project types.
26;; 26;;
27;; Not everyone can use automake, or an EDE project type. For 27;; Not everyone can use automake, or an EDE project type. For
diff --git a/lisp/cedet/ede/custom.el b/lisp/cedet/ede/custom.el
index a7470547cc2..fed1a1b2155 100644
--- a/lisp/cedet/ede/custom.el
+++ b/lisp/cedet/ede/custom.el
@@ -1,4 +1,4 @@
1;;; ede.el --- customization of EDE projects. 1;;; ede/custom.el --- customization of EDE projects.
2 2
3;; Copyright (C) 2010-2011 Free Software Foundation, Inc. 3;; Copyright (C) 2010-2011 Free Software Foundation, Inc.
4 4
diff --git a/lisp/cedet/ede/generic.el b/lisp/cedet/ede/generic.el
index 360b15499ca..7eef0a4121e 100644
--- a/lisp/cedet/ede/generic.el
+++ b/lisp/cedet/ede/generic.el
@@ -22,7 +22,7 @@
22;;; Commentary: 22;;; Commentary:
23;; 23;;
24;; There are a lot of build systems out there, and EDE can't support 24;; There are a lot of build systems out there, and EDE can't support
25;; them all fully. The ede-generic.el system is the base for 25;; them all fully. The ede/generic.el system is the base for
26;; supporting alternate build systems in a simple way, automatically. 26;; supporting alternate build systems in a simple way, automatically.
27;; 27;;
28;; The structure is for the ede-generic baseclass, which is augmented 28;; The structure is for the ede-generic baseclass, which is augmented
diff --git a/lisp/cedet/ede/proj-comp.el b/lisp/cedet/ede/proj-comp.el
index 401ea15d0d6..1a2843f7651 100644
--- a/lisp/cedet/ede/proj-comp.el
+++ b/lisp/cedet/ede/proj-comp.el
@@ -83,7 +83,7 @@ For example, yacc/lex files need additional chain rules, or inferences.")
83 :documentation 83 :documentation
84 "The commands used to execute this compiler. 84 "The commands used to execute this compiler.
85The object which uses this compiler will place these commands after 85The object which uses this compiler will place these commands after
86it's rule definition.") 86its rule definition.")
87 (autoconf :initarg :autoconf 87 (autoconf :initarg :autoconf
88 :initform nil 88 :initform nil
89 :type list 89 :type list
diff --git a/lisp/cedet/semantic/analyze/complete.el b/lisp/cedet/semantic/analyze/complete.el
index bbe87f34172..ae993a743d6 100644
--- a/lisp/cedet/semantic/analyze/complete.el
+++ b/lisp/cedet/semantic/analyze/complete.el
@@ -28,7 +28,7 @@
28;; 28;;
29;;; History: 29;;; History:
30;; 30;;
31;; Code was moved here from semantic-analyze.el 31;; Code was moved here from semantic/analyze.el
32 32
33(require 'semantic/analyze) 33(require 'semantic/analyze)
34 34
diff --git a/lisp/cedet/semantic/ctxt.el b/lisp/cedet/semantic/ctxt.el
index 08049201756..2eddfdc1c8e 100644
--- a/lisp/cedet/semantic/ctxt.el
+++ b/lisp/cedet/semantic/ctxt.el
@@ -106,7 +106,7 @@ Return non-nil if there is no upper context."
106 (let ((start (point))) 106 (let ((start (point)))
107 (if (semantic-up-context) 107 (if (semantic-up-context)
108 t 108 t
109 ;; Go over the list, and back over the end parenthisis. 109 ;; Go over the list, and back over the end parenthesis.
110 (condition-case nil 110 (condition-case nil
111 (progn 111 (progn
112 (forward-sexp 1) 112 (forward-sexp 1)
diff --git a/lisp/cedet/semantic/db-find.el b/lisp/cedet/semantic/db-find.el
index a7335d642be..34718d1fdd2 100644
--- a/lisp/cedet/semantic/db-find.el
+++ b/lisp/cedet/semantic/db-find.el
@@ -79,13 +79,13 @@
79;; The PATH argument is then the most interesting argument. It can 79;; The PATH argument is then the most interesting argument. It can
80;; have these values: 80;; have these values:
81;; 81;;
82;; nil - Take the current buffer, and use it's include list 82;; nil - Take the current buffer, and use its include list
83;; buffer - Use that buffer's include list. 83;; buffer - Use that buffer's include list.
84;; filename - Use that file's include list. If the file is not 84;; filename - Use that file's include list. If the file is not
85;; in a buffer, see of there is a semanticdb table for it. If 85;; in a buffer, see of there is a semanticdb table for it. If
86;; not, read that file into a buffer. 86;; not, read that file into a buffer.
87;; tag - Get that tag's buffer of file file. See above. 87;; tag - Get that tag's buffer of file file. See above.
88;; table - Search that table, and it's include list. 88;; table - Search that table, and its include list.
89;; 89;;
90;; Search Results: 90;; Search Results:
91;; 91;;
diff --git a/lisp/cedet/semantic/db-typecache.el b/lisp/cedet/semantic/db-typecache.el
index 2a78576092a..0096c1aab09 100644
--- a/lisp/cedet/semantic/db-typecache.el
+++ b/lisp/cedet/semantic/db-typecache.el
@@ -1,4 +1,4 @@
1;;; db-typecache.el --- Manage Datatypes 1;;; semantic/db-typecache.el --- Manage Datatypes
2 2
3;; Copyright (C) 2007-2011 Free Software Foundation, Inc. 3;; Copyright (C) 2007-2011 Free Software Foundation, Inc.
4 4
@@ -622,4 +622,4 @@ If there isn't one, create it.
622;; generated-autoload-load-name: "semantic/db-typecache" 622;; generated-autoload-load-name: "semantic/db-typecache"
623;; End: 623;; End:
624 624
625;;; semanticdb-typecache.el ends here 625;;; semantic/db-typecache.el ends here
diff --git a/lisp/cedet/semantic/db.el b/lisp/cedet/semantic/db.el
index dca1b3bafea..65897b96adb 100644
--- a/lisp/cedet/semantic/db.el
+++ b/lisp/cedet/semantic/db.el
@@ -229,7 +229,7 @@ it is in Emacs.")
229 :documentation 229 :documentation
230 "List of `semanticdb-table' objects refering to this one. 230 "List of `semanticdb-table' objects refering to this one.
231These aren't saved, but are instead recalculated after load. 231These aren't saved, but are instead recalculated after load.
232See the file semanticdb-ref.el for how this slot is used.") 232See the file semantic/db-ref.el for how this slot is used.")
233 (pointmax :initarg :pointmax 233 (pointmax :initarg :pointmax
234 :initform nil 234 :initform nil
235 :documentation "Size of buffer when written to disk. 235 :documentation "Size of buffer when written to disk.
@@ -441,7 +441,7 @@ Tools needing a per-file cache must subclass this, and then get one as
441needed. Cache objects are identified in semanticdb by subclass. 441needed. Cache objects are identified in semanticdb by subclass.
442In order to keep your cache up to date, be sure to implement 442In order to keep your cache up to date, be sure to implement
443`semanticdb-synchronize', and `semanticdb-partial-synchronize'. 443`semanticdb-synchronize', and `semanticdb-partial-synchronize'.
444See the file semantic-scope.el for an example." 444See the file semantic/scope.el for an example."
445 :abstract t) 445 :abstract t)
446 446
447(defmethod semanticdb-cache-get ((table semanticdb-abstract-table) 447(defmethod semanticdb-cache-get ((table semanticdb-abstract-table)
@@ -492,7 +492,7 @@ Tools needing a database cache must subclass this, and then get one as
492needed. Cache objects are identified in semanticdb by subclass. 492needed. Cache objects are identified in semanticdb by subclass.
493In order to keep your cache up to date, be sure to implement 493In order to keep your cache up to date, be sure to implement
494`semanticdb-synchronize', and `semanticdb-partial-synchronize'. 494`semanticdb-synchronize', and `semanticdb-partial-synchronize'.
495See the file semantic-scope.el for an example." 495See the file semantic/scope.el for an example."
496 :abstract t) 496 :abstract t)
497 497
498(defmethod semanticdb-cache-get ((db semanticdb-project-database) 498(defmethod semanticdb-cache-get ((db semanticdb-project-database)
diff --git a/lisp/cedet/semantic/decorate/include.el b/lisp/cedet/semantic/decorate/include.el
index 0e0a8849d78..e984965a737 100644
--- a/lisp/cedet/semantic/decorate/include.el
+++ b/lisp/cedet/semantic/decorate/include.el
@@ -471,7 +471,7 @@ like this in your .emacs file:
471 (ede-cpp-root-project \"NAME\" :file \"FILENAME\" :locate-fcn 'MYFCN) 471 (ede-cpp-root-project \"NAME\" :file \"FILENAME\" :locate-fcn 'MYFCN)
472 472
473See the CEDET manual, the EDE manual, or the commentary in 473See the CEDET manual, the EDE manual, or the commentary in
474ede-cpp-root.el for more. 474ede/cpp-root.el for more.
475 475
476If you think this header tag is marked in error, you may need to do: 476If you think this header tag is marked in error, you may need to do:
477 477
diff --git a/lisp/cedet/semantic/ede-grammar.el b/lisp/cedet/semantic/ede-grammar.el
index a4361053174..3a30a931d95 100644
--- a/lisp/cedet/semantic/ede-grammar.el
+++ b/lisp/cedet/semantic/ede-grammar.el
@@ -71,8 +71,8 @@ parsing different languages.")
71 "@for loadpath in . ${LOADPATH}; do \\" 71 "@for loadpath in . ${LOADPATH}; do \\"
72 " echo \"(add-to-list 'load-path \\\"$$loadpath\\\")\" >> grammar-make-script; \\" 72 " echo \"(add-to-list 'load-path \\\"$$loadpath\\\")\" >> grammar-make-script; \\"
73 "done;" 73 "done;"
74 "@echo \"(require 'semantic-load)\" >> grammar-make-script" 74 "@echo \"(require 'semantic/load)\" >> grammar-make-script"
75 "@echo \"(require 'semantic-grammar)\" >> grammar-make-script" 75 "@echo \"(require 'semantic/grammar)\" >> grammar-make-script"
76 ;; "@echo \"(setq debug-on-error t)\" >> grammar-make-script" 76 ;; "@echo \"(setq debug-on-error t)\" >> grammar-make-script"
77 "\"$(EMACS)\" -batch --no-site-file -l grammar-make-script -f semantic-grammar-batch-build-packages $^" 77 "\"$(EMACS)\" -batch --no-site-file -l grammar-make-script -f semantic-grammar-batch-build-packages $^"
78 ) 78 )
@@ -101,8 +101,8 @@ parsing different languages.")
101 "@for loadpath in . ${LOADPATH}; do \\" 101 "@for loadpath in . ${LOADPATH}; do \\"
102 " echo \"(add-to-list 'load-path \\\"$$loadpath\\\")\" >> grammar-make-script; \\" 102 " echo \"(add-to-list 'load-path \\\"$$loadpath\\\")\" >> grammar-make-script; \\"
103 "done;" 103 "done;"
104 "@echo \"(require 'semantic-load)\" >> grammar-make-script" 104 "@echo \"(require 'semantic/load)\" >> grammar-make-script"
105 "@echo \"(require 'semantic-grammar)\" >> grammar-make-script" 105 "@echo \"(require 'semantic/grammar)\" >> grammar-make-script"
106 ;; "@echo \"(setq debug-on-error t)\" >> grammar-make-script" 106 ;; "@echo \"(setq debug-on-error t)\" >> grammar-make-script"
107 "\"$(EMACS)\" -batch --no-site-file -l grammar-make-script -f semantic-grammar-batch-build-packages $^" 107 "\"$(EMACS)\" -batch --no-site-file -l grammar-make-script -f semantic-grammar-batch-build-packages $^"
108 ) 108 )
diff --git a/lisp/cedet/semantic/find.el b/lisp/cedet/semantic/find.el
index c62ed818945..c2d07fbcc35 100644
--- a/lisp/cedet/semantic/find.el
+++ b/lisp/cedet/semantic/find.el
@@ -333,7 +333,7 @@ Used in completion."
333 333
334;;;###autoload 334;;;###autoload
335(define-overloadable-function semantic-find-tags-by-scope-protection (scopeprotection parent &optional table) 335(define-overloadable-function semantic-find-tags-by-scope-protection (scopeprotection parent &optional table)
336 "Find all tags accessable by SCOPEPROTECTION. 336 "Find all tags accessible by SCOPEPROTECTION.
337SCOPEPROTECTION is a symbol which can be returned by the method 337SCOPEPROTECTION is a symbol which can be returned by the method
338`semantic-tag-protection'. A hard-coded order is used to determine a match. 338`semantic-tag-protection'. A hard-coded order is used to determine a match.
339PARENT is a tag representing the PARENT slot needed for 339PARENT is a tag representing the PARENT slot needed for
diff --git a/lisp/cedet/semantic/html.el b/lisp/cedet/semantic/html.el
index 80c0a0ddb95..972ce5e26bc 100644
--- a/lisp/cedet/semantic/html.el
+++ b/lisp/cedet/semantic/html.el
@@ -222,7 +222,7 @@ tag with greater section value than LEVEL is found."
222 "The children TAG expands to." 222 "The children TAG expands to."
223 (semantic-html-components tag)) 223 (semantic-html-components tag))
224 224
225;; In semantic-imenu.el, not part of Emacs. 225;; In semantic/imenu.el, not part of Emacs.
226(defvar semantic-imenu-expandable-tag-classes) 226(defvar semantic-imenu-expandable-tag-classes)
227(defvar semantic-imenu-bucketize-file) 227(defvar semantic-imenu-bucketize-file)
228(defvar semantic-imenu-bucketize-type-members) 228(defvar semantic-imenu-bucketize-type-members)
diff --git a/lisp/cedet/semantic/idle.el b/lisp/cedet/semantic/idle.el
index f17a5471d75..1c1233303e9 100644
--- a/lisp/cedet/semantic/idle.el
+++ b/lisp/cedet/semantic/idle.el
@@ -1314,4 +1314,4 @@ mouse-3: popup context menu"
1314;; generated-autoload-load-name: "semantic/idle" 1314;; generated-autoload-load-name: "semantic/idle"
1315;; End: 1315;; End:
1316 1316
1317;;; semantic-idle.el ends here 1317;;; semantic/idle.el ends here
diff --git a/lisp/cedet/semantic/java.el b/lisp/cedet/semantic/java.el
index 71a205386db..c3075634242 100644
--- a/lisp/cedet/semantic/java.el
+++ b/lisp/cedet/semantic/java.el
@@ -256,7 +256,7 @@ Optional argument COLOR indicates that color should be mixed in."
256(define-mode-local-override semantic-documentation-for-tag 256(define-mode-local-override semantic-documentation-for-tag
257 java-mode (&optional tag nosnarf) 257 java-mode (&optional tag nosnarf)
258 "Find documentation from TAG and return it as a clean string. 258 "Find documentation from TAG and return it as a clean string.
259Java has documentation set in a comment preceding TAG's definition. 259Java have documentation set in a comment preceding TAG's definition.
260Attempt to strip out comment syntactic sugar, unless optional argument 260Attempt to strip out comment syntactic sugar, unless optional argument
261NOSNARF is non-nil. 261NOSNARF is non-nil.
262If NOSNARF is 'lex, then return the semantic lex token." 262If NOSNARF is 'lex, then return the semantic lex token."
diff --git a/lisp/cedet/semantic/lex-spp.el b/lisp/cedet/semantic/lex-spp.el
index de4cb7a9c62..e49968b07e7 100644
--- a/lisp/cedet/semantic/lex-spp.el
+++ b/lisp/cedet/semantic/lex-spp.el
@@ -1,4 +1,4 @@
1;;; lex-spp.el --- Semantic Lexical Pre-processor 1;;; semantic/lex-spp.el --- Semantic Lexical Pre-processor
2 2
3;; Copyright (C) 2006-2011 Free Software Foundation, Inc. 3;; Copyright (C) 2006-2011 Free Software Foundation, Inc.
4 4
@@ -1230,4 +1230,4 @@ If BUFFER is not provided, use the current buffer."
1230;; generated-autoload-load-name: "semantic/lex-spp" 1230;; generated-autoload-load-name: "semantic/lex-spp"
1231;; End: 1231;; End:
1232 1232
1233;;; semantic-lex-spp.el ends here 1233;;; semantic/lex-spp.el ends here
diff --git a/lisp/cedet/semantic/sort.el b/lisp/cedet/semantic/sort.el
index d62c3bb17d9..c3d8b26810c 100644
--- a/lisp/cedet/semantic/sort.el
+++ b/lisp/cedet/semantic/sort.el
@@ -1,4 +1,4 @@
1;;; sort.el --- Utilities for sorting and re-arranging tag tables. 1;;; semantic/sort.el --- Utilities for sorting and re-arranging tag tables.
2 2
3;;; Copyright (C) 1999-2005, 2007-2011 Free Software Foundation, Inc. 3;;; Copyright (C) 1999-2005, 2007-2011 Free Software Foundation, Inc.
4 4
@@ -27,7 +27,7 @@
27;; purposes. Re-organization may be alphabetical, or even a complete 27;; purposes. Re-organization may be alphabetical, or even a complete
28;; reorganization of parents and children. 28;; reorganization of parents and children.
29;; 29;;
30;; Originally written in semantic-util.el 30;; Originally written in semantic/util.el
31;; 31;;
32 32
33(require 'semantic) 33(require 'semantic)
@@ -565,4 +565,4 @@ See `semantic-tag-external-class' for details."
565;; generated-autoload-load-name: "semantic/sort" 565;; generated-autoload-load-name: "semantic/sort"
566;; End: 566;; End:
567 567
568;;; semantic-sort.el ends here 568;;; semantic/sort.el ends here
diff --git a/lisp/cedet/semantic/texi.el b/lisp/cedet/semantic/texi.el
index 66327cbe2ff..393d64e6420 100644
--- a/lisp/cedet/semantic/texi.el
+++ b/lisp/cedet/semantic/texi.el
@@ -446,7 +446,7 @@ that start with that symbol."
446 446
447;;; Parser Setup 447;;; Parser Setup
448;; 448;;
449;; In semantic-imenu.el, not part of Emacs. 449;; In semantic/imenu.el, not part of Emacs.
450(defvar semantic-imenu-expandable-tag-classes) 450(defvar semantic-imenu-expandable-tag-classes)
451(defvar semantic-imenu-bucketize-file) 451(defvar semantic-imenu-bucketize-file)
452(defvar semantic-imenu-bucketize-type-members) 452(defvar semantic-imenu-bucketize-type-members)
@@ -592,7 +592,7 @@ Note: TYPE not yet implemented."
592;; (error "Could not find documentation for %s" (semantic-tag-name tag))) 592;; (error "Could not find documentation for %s" (semantic-tag-name tag)))
593;; 593;;
594;; (require 'srecode) 594;; (require 'srecode)
595;; (require 'srecode-texi) 595;; (require 'srecode/texi)
596;; 596;;
597;; ;; If we have a string, do the replacement. 597;; ;; If we have a string, do the replacement.
598;; (delete-region (semantic-tag-start tag) 598;; (delete-region (semantic-tag-start tag)
diff --git a/lisp/cedet/semantic/wisent/java-tags.el b/lisp/cedet/semantic/wisent/java-tags.el
index d0647d8e271..f3d11d38512 100644
--- a/lisp/cedet/semantic/wisent/java-tags.el
+++ b/lisp/cedet/semantic/wisent/java-tags.el
@@ -77,7 +77,7 @@ This function override `get-local-variables'."
77;;;; Semantic integration of the Java LALR parser 77;;;; Semantic integration of the Java LALR parser
78;;;; 78;;;;
79 79
80;; In semantic-imenu.el, not part of Emacs. 80;; In semantic/imenu.el, not part of Emacs.
81(defvar semantic-imenu-summary-function) 81(defvar semantic-imenu-summary-function)
82 82
83;;;###autoload 83;;;###autoload
diff --git a/lisp/cedet/srecode.el b/lisp/cedet/srecode.el
index 7b499d1a5e7..5527273a3a5 100644
--- a/lisp/cedet/srecode.el
+++ b/lisp/cedet/srecode.el
@@ -31,7 +31,7 @@
31;; 31;;
32;; Contemplation of the simplistic problem within the scope of 32;; Contemplation of the simplistic problem within the scope of
33;; semantic showed that the solution was more complex than could 33;; semantic showed that the solution was more complex than could
34;; possibly be handled in semantic-format.el. Semantic Recode, or 34;; possibly be handled in semantic/format.el. Semantic Recode, or
35;; srecode is a rich API for generating code out of semantic tags, or 35;; srecode is a rich API for generating code out of semantic tags, or
36;; recoding the tags. 36;; recoding the tags.
37;; 37;;
diff --git a/lisp/cedet/srecode/compile.el b/lisp/cedet/srecode/compile.el
index 0a117bad9bc..052999bf7c8 100644
--- a/lisp/cedet/srecode/compile.el
+++ b/lisp/cedet/srecode/compile.el
@@ -103,7 +103,7 @@ stack is broken."
103;; work, and the smaller, simple inserter object is saved in 103;; work, and the smaller, simple inserter object is saved in
104;; the compiled templates. 104;; the compiled templates.
105;; 105;;
106;; See srecode-insert.el for the specialized classes. 106;; See srecode/insert.el for the specialized classes.
107;; 107;;
108(defclass srecode-template-inserter (eieio-named) 108(defclass srecode-template-inserter (eieio-named)
109 ((secondname :initarg :secondname 109 ((secondname :initarg :secondname
diff --git a/lisp/cedet/srecode/dictionary.el b/lisp/cedet/srecode/dictionary.el
index 06496160b8c..521532bed33 100644
--- a/lisp/cedet/srecode/dictionary.el
+++ b/lisp/cedet/srecode/dictionary.el
@@ -1,4 +1,4 @@
1;;; srecode-dictionary.el --- Dictionary code for the semantic recoder. 1;;; srecode/dictionary.el --- Dictionary code for the semantic recoder.
2 2
3;; Copyright (C) 2007-2011 Free Software Foundation, Inc. 3;; Copyright (C) 2007-2011 Free Software Foundation, Inc.
4 4
diff --git a/lisp/cedet/srecode/document.el b/lisp/cedet/srecode/document.el
index bccc85fb82b..a52cadbfb2c 100644
--- a/lisp/cedet/srecode/document.el
+++ b/lisp/cedet/srecode/document.el
@@ -37,7 +37,7 @@
37;; Document has now been ported to srecode, using the semantic recoder 37;; Document has now been ported to srecode, using the semantic recoder
38;; as the templating engine. 38;; as the templating engine.
39 39
40;; This file combines srecode-document.el and srecode-document-vars.el 40;; This file combines srecode/document.el and srecode/document-vars.el
41;; from the CEDET repository. 41;; from the CEDET repository.
42 42
43(require 'srecode/args) 43(require 'srecode/args)
diff --git a/lisp/cedet/srecode/insert.el b/lisp/cedet/srecode/insert.el
index 931d0b3d73e..84964a9e8b4 100644
--- a/lisp/cedet/srecode/insert.el
+++ b/lisp/cedet/srecode/insert.el
@@ -1,4 +1,4 @@
1;;; srecode/insert --- Insert srecode templates to an output stream. 1;;; srecode/insert.el --- Insert srecode templates to an output stream.
2 2
3;; Copyright (C) 2005, 2007-2011 Free Software Foundation, Inc. 3;; Copyright (C) 2005, 2007-2011 Free Software Foundation, Inc.
4 4
@@ -911,7 +911,7 @@ this template instance."
911 (setq active (cdr active))) 911 (setq active (cdr active)))
912 (when (not tmpl) 912 (when (not tmpl)
913 ;; If it wasn't in this context, look to see if it 913 ;; If it wasn't in this context, look to see if it
914 ;; defines it's own context 914 ;; defines its own context
915 (setq tmpl (srecode-template-get-table (srecode-table) 915 (setq tmpl (srecode-template-get-table (srecode-table)
916 templatenamepart))) 916 templatenamepart)))
917 ) 917 )
diff --git a/lisp/cedet/srecode/java.el b/lisp/cedet/srecode/java.el
index 69534e053f1..4e76c15e300 100644
--- a/lisp/cedet/srecode/java.el
+++ b/lisp/cedet/srecode/java.el
@@ -1,4 +1,4 @@
1;;; srecode-java.el --- Srecode Java support 1;;; srecode/java.el --- Srecode Java support
2 2
3;; Copyright (C) 2009-2011 Free Software Foundation, Inc. 3;; Copyright (C) 2009-2011 Free Software Foundation, Inc.
4 4
diff --git a/lisp/cedet/srecode/template.el b/lisp/cedet/srecode/template.el
index e0cf42b75df..5dd32a85786 100644
--- a/lisp/cedet/srecode/template.el
+++ b/lisp/cedet/srecode/template.el
@@ -1,4 +1,4 @@
1;;; srecode-template.el --- SRecoder template language parser support. 1;;; srecode/template.el --- SRecoder template language parser support.
2 2
3;; Copyright (C) 2005, 2007-2011 Free Software Foundation, Inc. 3;; Copyright (C) 2005, 2007-2011 Free Software Foundation, Inc.
4 4
diff --git a/lisp/cedet/srecode/texi.el b/lisp/cedet/srecode/texi.el
index 38d8e765d41..33440d04432 100644
--- a/lisp/cedet/srecode/texi.el
+++ b/lisp/cedet/srecode/texi.el
@@ -1,4 +1,4 @@
1;;; srecode-texi.el --- Srecode texinfo support. 1;;; srecode/texi.el --- Srecode texinfo support.
2 2
3;; Copyright (C) 2008-2011 Free Software Foundation, Inc. 3;; Copyright (C) 2008-2011 Free Software Foundation, Inc.
4 4