Synch Semantic to CEDET 1.0.

Move CEDET ChangeLog entries to new file lisp/cedet/ChangeLog.

* semantic.el (semantic-version): Update to 2.0.
(semantic-mode-map): Add "," and "m" bindings.
(navigate-menu): Update.

* semantic/symref.el (semantic-symref-calculate-rootdir):
New function.
(semantic-symref-detect-symref-tool): Use it.

* semantic/symref/grep.el (semantic-symref-grep-shell): New var.
(semantic-symref-perform-search): Use it.  Calculate root dir with
semantic-symref-calculate-rootdir.
(semantic-symref-derive-find-filepatterns): Improve error message.

* semantic/symref/list.el
(semantic-symref-results-mode-map): New bindings.
(semantic-symref-auto-expand-results): New option.
(semantic-symref-results-dump): Obey auto-expand.
(semantic-symref-list-expand-all, semantic-symref-regexp)
(semantic-symref-list-contract-all)
(semantic-symref-list-map-open-hits)
(semantic-symref-list-update-open-hits)
(semantic-symref-list-create-macro-on-open-hit)
(semantic-symref-list-call-macro-on-open-hits): New functions.
(semantic-symref-list-menu-entries)
(semantic-symref-list-menu): New vars.
(semantic-symref-list-map-open-hits): Move cursor to beginning of
match before calling the mapped function.

* semantic/doc.el
(semantic-documentation-comment-preceeding-tag): Do nothing if the
mode doesn't provide comment-start-skip.

* semantic/scope.el
(semantic-analyze-scope-nested-tags-default): Strip duplicates.
(semantic-analyze-scoped-inherited-tag-map): Take the tag we are
looking for as part of the scoped tags list.

* semantic/html.el (semantic-default-html-setup): Add
senator-step-at-tag-classes.

* semantic/decorate/include.el
(semantic-decoration-on-unknown-includes): Change light bgcolor.
(semantic-decoration-on-includes-highlight-default): Check that
the include tag has a postion.

* semantic/complete.el (semantic-collector-local-members):
(semantic-complete-read-tag-local-members)
(semantic-complete-jump-local-members): New class and functions.
(semantic-complete-self-insert): Save excursion before completing.

* semantic/analyze/complete.el
(semantic-analyze-possible-completions-default): If no completions
are found, return the raw by-name-only completion list.  Add FLAGS
arguments.  Add support for 'no-tc (type constraint) and
'no-unique, or no stripping duplicates.
(semantic-analyze-possible-completions-default): Add FLAGS arg.

* semantic/util-modes.el
(semantic-stickyfunc-show-only-functions-p): New option.
(semantic-stickyfunc-fetch-stickyline): Don't show stickytext for
the very first line in a buffer.

* semantic/util.el (semantic-hack-search)
(semantic-recursive-find-nonterminal-by-name)
(semantic-current-tag-interactive): Deleted.
(semantic-describe-buffer): Fix expand-nonterminal.  Add
lex-syntax-mods, type relation separator char, and command
separation char.
(semantic-sanity-check): Only message if called interactively.

* semantic/tag.el (semantic-tag-deep-copy-one-tag): Copy the
:filename property and the tag position.

* semantic/lex-spp.el (semantic-lex-spp-lex-text-string):
Add recursion limit.

* semantic/imenu.el (semantic-imenu-bucketize-type-members):
Make this buffer local, not the obsoleted variable.

* semantic/idle.el: Add breadcrumbs support.
(semantic-idle-summary-current-symbol-info-default)
(semantic-idle-tag-highlight)
(semantic-idle-completion-list-default): Use
semanticdb-without-unloaded-file-searches for speed, and to
conform to the controls that specify if the idle timer is supposed
to be parsing unparsed includes.
(semantic-idle-symbol-highlight-face)
(semantic-idle-symbol-maybe-highlight): Rename from *-summary-*.
Callers changed.
(semantic-idle-work-parse-neighboring-files-flag): Default to nil.
(semantic-idle-work-update-headers-flag): New var.
(semantic-idle-work-for-one-buffer): Use it.
(semantic-idle-local-symbol-highlight): Rename from
semantic-idle-tag-highlight.
(semantic-idle-truncate-long-summaries): New option.

* semantic/ia.el (semantic-ia-cache)
(semantic-ia-get-completions): Deleted.  Callers changed.
(semantic-ia-show-variants): New command.
(semantic-ia-show-doc): If doc is empty, don't make a temp buffer.
(semantic-ia-show-summary): If there isn't anything to show, say so.

* semantic/grammar.el (semantic-grammar-create-package):
Save the buffer even in batch mode.

* semantic/fw.el
(semanticdb-without-unloaded-file-searches): New macro.

* semantic/dep.el (semantic-dependency-find-file-on-path):
Fix case dereferencing ede-object when it is a list.

* semantic/db-typecache.el (semanticdb-expand-nested-tag)
(semanticdb-typecache-faux-namespace): New functions.
(semanticdb-typecache-file-tags)
(semanticdb-typecache-merge-streams): Use them.
(semanticdb-typecache-file-tags): When deriving tags from a file,
give the mode a chance to monkey with the tag copy.
(semanticdb-typecache-find-default): Wrap find in save-excursion.
(semanticdb-typecache-find-by-name-helper): Merge found names down.

* semantic/db-global.el
(semanticdb-enable-gnu-global-in-buffer): Don't show messages if
GNU Global is not available and we don't want to throw an error.

* semantic/db-find.el (semanticdb-find-result-nth-in-buffer):
When trying to normalize the tag to a buffer, don't error if
set-buffer method doesn't exist.

* semantic/db-file.el (semanticdb-save-db): Simplify msg.

* semantic/db.el (semanticdb-refresh-table): If forcing a
refresh on a file not in a buffer, use semantic-find-file-noselect
and delete the buffer after use.
(semanticdb-current-database-list): When calculating root via
hooks, force it through true-filename and skip the list of
possible roots.

* semantic/ctxt.el (semantic-ctxt-imported-packages): New.

* semantic/analyze/debug.el
(semantic-analyzer-debug-insert-tag): Reset standard output to
current buffer.
(semantic-analyzer-debug-global-symbol)
(semantic-analyzer-debug-missing-innertype): Change "prefix" to
"symbol" in messages.

* semantic/analyze/refs.el: (semantic-analyze-refs-impl)
(semantic-analyze-refs-proto): When calculating value, make sure
the found tag is 'similar' to the originating tag.
(semantic--analyze-refs-find-tags-with-parent): Attempt to
identify matches via imported symbols of parents.
(semantic--analyze-refs-full-lookup-with-parents): Do a deep
search during the brute search.

* semantic/analyze.el
(semantic-analyze-find-tag-sequence-default): Be robust to
calculated scopes being nil.

* semantic/bovine/c.el (semantic-c-describe-environment): Add
project macro symbol array.
(semantic-c-parse-lexical-token): Add recursion limit.
(semantic-ctxt-imported-packages, semanticdb-expand-nested-tag):
New overrides.
(semantic-expand-c-tag-namelist): Split a full type from a typedef
out to its own tag.
(semantic-expand-c-tag-namelist): Do not split out a typedef'd
inline type if it is an anonymous type.
(semantic-c-reconstitute-token): Use the optional initializers as
a clue that some function is probably a constructor.  When
defining the type of these constructors, split the parent name,
and use only the class part, if applicable.

* semantic/bovine/c-by.el:
* semantic/wisent/python-wy.el: Regenerate.

1 files changed, 2 insertions, 909 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2e2f3b539b9..29f7f77fc0a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -559,10 +559,6 @@
 
         * help-fns.el (find-lisp-object-file-name): Doc fix (bug#6494).
 
-2010-07-20  Juanma Barranquero  <lekktu@gmail.com>
-
-        * cedet/semantic/db-file.el (object-write): Fix typo in docstring.
-
 2010-07-19  Juanma Barranquero  <lekktu@gmail.com>
 
         * time.el (display-time-day-and-date): Remove spurious * in docstring.
@@ -827,12 +823,6 @@
         * term/common-win.el (x-colors): Add "dark green" and "dark
         turquoise" (Bug#6332).
 
-2010-06-03  Eric Ludlam  <zappo@gnu.org>
-
-        * cedet/semantic/lex-spp.el
-        (semantic-lex-spp-table-write-slot-value): Instead of erroring on
-        invalid values during save, just save a nil (Bug#6324).
-
 2010-06-03  Glenn Morris  <rgm@gnu.org>
 
         * desktop.el (desktop-clear-preserve-buffers):
@@ -847,11 +837,6 @@
         * vc-bzr.el (vc-bzr-revision-completion-table): Apply
         `file-directory-p' to the filename part rather than to the whole text.
 
-2010-05-31  Jonathan Marchand  <jonathlela@gmail.com>  (tiny change)
-
-        * cedet/ede/cpp-root.el (ede-set-project-variables): Fix feature name
-        (bug#6231).
-
 2010-05-31  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * man.el (Man-completion-table): Let the user type "-k " (bug#6319).
@@ -1006,11 +991,6 @@
 
         * minibuffer.el (completion-at-point): Doc fix.
 
-2010-04-18  Chong Yidong  <cyd@stupidchicken.com>
-
-        * cedet/ede/pmake.el (ede-proj-makefile-insert-variables):
-        Don't destroy list before using it.
-
 2010-04-17  Dan Nicolaescu  <dann@ics.uci.edu>
 
         Fix the version number for added files.
@@ -1083,12 +1063,6 @@
         * help.el (help-window-setup-finish): Doc fix (Bug#5830).
         Reported by monkey@sandpframing.com.
 
-2010-04-02  Juanma Barranquero  <lekktu@gmail.com>
-
-        * cedet/semantic/imenu.el (semantic-imenu-bucketize-type-members)
-        (semantic-create-imenu-directory-index): Fix typos in docstrings.
-        (semantic-imenu-goto-function): Reflow docstring.
-
 2010-03-30  Tomas Abrahamsson  <tab@lysator.liu.se>
 
         * textmodes/artist.el (artist-mode): Fix typo in docstring.
@@ -1166,8 +1140,6 @@
         * faces.el (set-face-attribute): Fix typo in docstring.
         (face-valid-attribute-values): Reflow docstring.
 
-        * cedet/srecode/table.el (srecode-template-table): Fix docstring typo.
-
 2010-03-23  Glenn Morris  <rgm@gnu.org>
 
         * textmodes/flyspell.el (sgml-lexical-context): Autoload it (Bug#5752).
@@ -1235,11 +1207,6 @@
         (tramp-open-connection-setup-interactive-shell): Remove workaround
         for OpenSolaris bug, it is not needed anymore.
 
-2010-03-13  Eric M. Ludlam  <zappo@gnu.org>
-
-        * cedet/semantic/imenu.el: New file, from the CEDET repository
-        (Bug#5412).
-
 2010-03-12  Glenn Morris  <rgm@gnu.org>
 
         * emacs-lisp/cl-macs.el (defsubst*): Add autoload cookie.  (Bug#4427)
@@ -1288,11 +1255,6 @@
         (vc-git-show-log-entry): Use prog1.
         (vc-git-after-dir-status-stage): Remove unused var `remaining'.
 
-2010-03-06  Glenn Morris  <rgm@gnu.org>
-
-        * cedet/semantic/grammar.el (semantic-grammar-header-template):
-        Update template copyright to GPLv3+.
-
 2010-03-05  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * man.el (Man-files-regexp): Tighten up the regexp (bug#5686).
@@ -1359,9 +1321,6 @@
 
         * textmodes/reftex-toc.el (reftex-toc-promote-prepare):
         * emacs-lisp/elint.el (elint-add-required-env):
-        * cedet/semantic/db-find.el
-        (semanticdb-find-translate-path-brutish-default):
-        * cedet/ede/make.el (ede-make-check-version):
         * calendar/icalendar.el (icalendar--add-diary-entry):
         * calc/calcalg2.el (math-tracing-integral):
         * files.el (recover-session-finish): Use with-current-buffer
@@ -1526,12 +1485,6 @@
 
         * doc-view.el (doc-view): Add to data custom group.
 
-        * cedet/data-debug.el (data-debug): Move to extensions group.
-
-        * cedet/ede.el (ede):
-        * cedet/srecode.el (srecode):
-        * cedet/semantic.el (semantic): Put in tools and extensions group.
-
         * nxml/nxml-mode.el (nxml-faces): Remove from font-lock-faces group.
 
         * textmodes/flyspell.el (flyspell-word): Obey the offset specified
@@ -1568,10 +1521,6 @@
 
         * outline.el (outline-head-from-level):
         * simple.el (with-wrapper-hook):
-        * cedet/ede.el (ede-run-target, project-delete-target)
-        (project-dist-files, ede-name, ede-documentation, ede-parent-project)
-        (ede-adebug-project, ede-adebug-project-parent)
-        (ede-adebug-project-root):
         * emacs-lisp/elint.el (elint-extra-errors, elint-current-buffer)
         (elint-defun, elint-buffer-env, elint-top-form-logged)
         (elint-unbound-variable):
@@ -2020,70 +1969,10 @@
 
 2010-01-18  Juanma Barranquero  <lekktu@gmail.com>
 
-        * cedet/ede/locate.el (ede-locate-file-in-project)
-        (ede-locate-file-in-project-impl): Fix typos in docstrings.
-        (ede-enable-locate-on-project): Fix typos in error messages.
-
-        * cedet/semantic/util-modes.el (semantic-unmatched-syntax-face)
-        (semantic-stickyfunc-old-hlf, semantic-stickyfunc-header-line-format)
-        (semantic-stickyfunc-sticky-classes, semantic-highlight-func-mode-setup)
-        (semantic-stickyfunc-fetch-stickyline): Fix typos in docstrings.
-        (semantic-stickyfunc-popup-menu, semantic-highlight-func-popup-menu):
-        Fix typos in menu help.
-
         * emacs-lisp/chart.el (chart-file-count, chart-rmail-from):
         Fix typos in chart titles.
 
         * whitespace.el (whitespace-style, global-whitespace-newline-mode):
-        * cedet/semantic.el (semantic-require-version, semantic--buffer-cache)
-        (semantic-unmatched-syntax-cache-check, semantic-unmatched-syntax-hook)
-        (semantic--before-fetch-tags-hook, semantic-new-buffer-fcn-was-run)
-        (semantic--umatched-syntax-needs-refresh-p, semantic-elapsed-time)
-        (semantic-parse-stream, semantic-parse-region)
-        (semantic-parse-region-default, semantic--set-buffer-cache)
-        (semantic-minimum-working-buffer-size, semantic-refresh-tags-safe)
-        (semantic-bovinate-toplevel, semantic-load-system-cache-loaded)
-        (semantic-default-submodes):
-        * cedet/semantic/db-ebrowse.el (semanticdb-table-ebrowse)
-        (semanticdb-create-ebrowse-database)
-        (semanticdb-find-tags-for-completion-method)
-        (semanticdb-find-tags-by-class-method)
-        (semanticdb-deep-find-tags-by-name-method)
-        (semanticdb-deep-find-tags-for-completion-method):
-        * cedet/semantic/db-el.el (semanticdb-elisp-mapatom-collector)
-        (semanticdb-find-tags-by-name-method, emacs-lisp-mode)
-        (semanticdb-find-tags-for-completion-method)
-        (semanticdb-find-tags-by-class-method)
-        (semanticdb-deep-find-tags-for-completion-method):
-        * cedet/semantic/db-find.el (semanticdb-find-translate-path)
-        (semanticdb-find-need-cache-update-p, semanticdb-find-result-with-nil-p)
-        (semanticdb-find-scanned-include-tags, semanticdb-find-tags-collector)
-        (semanticdb-find-tags-by-name-method)
-        (semanticdb-find-tags-by-name-regexp-method)
-        (semanticdb-find-tags-for-completion-method)
-        (semanticdb-find-tags-by-class-method)
-        (semanticdb-find-tags-external-children-of-type-method)
-        (semanticdb-find-tags-subclasses-of-type-method)
-        (semanticdb-deep-find-tags-by-name-method)
-        (semanticdb-deep-find-tags-by-name-regexp-method)
-        (semanticdb-deep-find-tags-for-completion-method):
-        * cedet/semantic/db-global.el (semanticdb-enable-gnu-global-hook)
-        (semanticdb-enable-gnu-global-in-buffer)
-        (semanticdb-find-tags-for-completion-method)
-        (semanticdb-deep-find-tags-by-name-method)
-        (semanticdb-deep-find-tags-for-completion-method):
-        * cedet/semantic/db-javascript.el (semanticdb-javascript-tags)
-        (javascript-mode, semanticdb-find-translate-path)
-        (semanticdb-find-tags-for-completion-method)
-        (semanticdb-find-tags-by-class-method)
-        (semanticdb-deep-find-tags-by-name-method)
-        (semanticdb-deep-find-tags-for-completion-method)
-        (semanticdb-find-tags-external-children-of-type-method):
-        * cedet/semantic/idle.el (semantic-idle-work-core-handler)
-        (define-semantic-idle-service, semantic-idle-summary-useful-context-p)
-        (global-semantic-idle-scheduler-mode):
-        * cedet/srecode/dictionary.el (srecode-field-value)
-        (srecode-dictionary-add-section-dictionary):
         * emacs-lisp/eieio.el (eieio-error-unsupported-class-tags)
         (eieio-generic-form, eieio-help-mode-augmentation-maybee, eieio-browse)
         (describe-class, eieio-describe-generic, describe-generic):
@@ -2135,13 +2024,8 @@
 
         * calc/calc.el (calc-command-flags): Give it an initial value.
 
-2010-01-17  Glenn Morris  <rgm@gnu.org>
-
-        * cedet/semantic/idle.el (semantic-idle-work-for-one-buffer): Doc fix.
-
 2010-01-17  Juanma Barranquero  <lekktu@gmail.com>
 
-        * cedet/semantic.el (semantic-mode):
         * files.el (minibuffer-with-setup-hook):
         * textmodes/artist.el (artist-mt, artist-key-undraw-continously)
         (artist-key-draw-continously, artist-key-do-continously-continously)
@@ -2173,17 +2057,6 @@
 
 2010-01-16  Mario Lang  <mlang@delysid.org>
 
-        * cedet/ede/cpp-root.el (ede-cpp-root-project):
-        * cedet/ede/files.el (ede-expand-filename):
-        * cedet/ede/simple.el (ede-simple-project):
-        * cedet/semantic/complete.el (semantic-complete-read-tag-engine)
-        (semantic-complete-inline-tag-engine):
-        * cedet/semantic/db-el.el (semanticdb-equivalent-mode):
-        * cedet/semantic/db-global.el (semanticdb-equivalent-mode):
-        * cedet/semantic/db-javascript.el (semanticdb-equivalent-mode):
-        * cedet/semantic/db.el (semanticdb-equivalent-mode):
-        * cedet/semantic/decorate/include.el (semantic-decoration-unknown-include-describe):
-        * cedet/semantic/idle.el (semantic-idle-work-for-one-buffer):
         * emacs-lisp/chart.el (chart-translate-namezone):
         * textmodes/artist.el (artist-compute-popup-menu-table):
         Remove duplicated words in doc-strings.
@@ -2212,13 +2085,6 @@
         * find-cmd.el (find-constituents):
         * vc-arch.el (vc-arch-root):
         * window.el (window-body-height, pop-up-frames):
-        * cedet/semantic/edit.el (semantic-reparse-needed-change-hook)
-        (semantic-no-reparse-needed-change-hook):
-        * cedet/srecode/insert.el (srecode-resolve-argument-list)
-        (srecode-template-inserter-blank, srecode-template-inserter-variable)
-        (srecode-template-inserter-ask, srecode-template-inserter-width)
-        (srecode-template-inserter-section-start)
-        (srecode-template-inserter-section-end, srecode-insert-method):
         * emacs-lisp/eieio-base.el (eieio-singleton, slot-missing):
         * progmodes/ada-stmt.el (ada-if):
         * progmodes/gdb-ui.el (gdb-jsonify-buffer):
@@ -2289,36 +2155,6 @@
         * mail/emacsbug.el (report-emacs-bug-pretest-address): Set
         it to bug-gnu-emacs rather than emacs-pretest-bug.
 
-2010-01-12  Juanma Barranquero  <lekktu@gmail.com>
-
-        * cedet/data-debug.el (data-debug): Fix customization group reference.
-
-2010-01-12  Juanma Barranquero  <lekktu@gmail.com>
-
-        * cedet/semantic/analyze.el (semantic-analyze-push-error)
-        (semantic-analyze-context, semantic-analyze-context-assignment)
-        (semantic-analyze-find-tag-sequence, semantic-analyze-find-tag):
-        * cedet/semantic/java.el (java-mode, semantic-tag-include-filename)
-        (semantic-java-doc-keywords-map):
-        * cedet/semantic/bovine/c.el (c-mode, semantic-c-member-of-autocast)
-        (semantic-lex-c-nested-namespace-ignore-second, semantic-parse-region)
-        (semantic-c-parse-lexical-token, semantic-c-debug-mode-init-pch)
-        (semantic-c-classname, semantic-format-tag-uml-prototype)
-        (semantic-c-dereference-namespace, semantic-analyze-type-constants):
-        * cedet/semantic/bovine/el.el (semantic-elisp-form-to-doc-string)
-        (semantic-emacs-lisp-obsoleted-doc, semantic-up-context)
-        (semantic-get-local-variables, semantic-end-of-command)
-        (semantic-beginning-of-command, semantic-ctxt-current-class-list)
-        (lisp-mode):
-        * cedet/semantic/bovine/make.el (makefile-mode):
-        * cedet/semantic/wisent/python.el (wisent-python-string-re)
-        (wisent-python-implicit-line-joining-p, wisent-python-forward-string)
-        (wisent-python-lex-beginning-of-line, wisent-python-lex-end-of-line)
-        (semantic-lex, semantic-get-local-variables, python-mode):
-        * cedet/semantic/wisent/python-wy.el (wisent-python-wy--keyword-table):
-        * cedet/srecode/extract.el (srecode-extract-state-set)
-        (srecode-extract-method): Fix typos in docstrings.
-
 2010-01-11  Sam Steingold  <sds@gnu.org>
 
         * imenu.el (imenu-default-create-index-function): Detect infinite
@@ -2377,17 +2213,9 @@
 
 2010-01-10  Chong Yidong  <cyd@stupidchicken.com>
 
-        * cedet/semantic.el (semantic-new-buffer-setup-functions):
-        Add python parser.
-
         * Makefile.in (ELCFILES): Add wisent/python-wy.el and
         wisent/python.el.
 
-2010-01-10  Richard Kim  <emacs18@gmail.com>
-
-        * cedet/semantic/wisent/python-wy.el:
-        * cedet/semantic/wisent/python.el: New files.
-
 2010-01-09  Chong Yidong  <cyd@stupidchicken.com>
 
         * man.el (Man-goto-section): Signal error if the section is not
@@ -2571,9 +2399,6 @@
 
         * mpc.el (mpc-playlist-delete): Fix typo in error messages.
 
-        * cedet/semantic/db-typecache.el (semanticdb-typecache-find-default):
-        Fix typo in docstring.
-
         * net/imap-hash.el (imap-hash-make): Doc fix.
         (imap-hash-test): Fix typo in error message; reflow docstring.
         (imap-hash-p, imap-hash-get, imap-hash-put, imap-hash-make-message)
@@ -2802,14 +2627,6 @@
         `Info-display-images-node', and not put the `invisible' property
         in this case.
 
-2009-12-14  Chong Yidong  <cyd@stupidchicken.com>
-
-        * cedet/semantic/mru-bookmark.el (global-semantic-mru-bookmark-mode)
-        (semantic-mru-bookmark-mode): Doc fixes.
-
-        * cedet/semantic/db.el (semanticdb-cache-get): Use error instead
-        of assert.
-
 2009-12-13  Glenn Morris  <rgm@gnu.org>
 
         * mail/emacsbug.el (message-sort-headers): Define for compiler.
@@ -3227,9 +3044,6 @@
         * bindings.el (complete-symbol): Call semantic-ia-complete-symbol
         if possible.
 
-        * cedet/semantic/ia.el (semantic-ia-complete-symbol):
-        Make argument optional.
-
         * shell.el (shell): Require ansi-color (Bug#5113).
 
         * ansi-color.el (ansi-color-for-comint-mode): Default to t.
@@ -3257,24 +3071,6 @@
         (Info-mode-menu): Add `Info-virtual-index' to the menu.
         (Info-mode): Add `Info-virtual-index' to the docstring.
 
-2009-12-05  Eric Ludlam  <zappo@gnu.org>
-
-        * cedet/semantic/bovine/c.el (semantic-c-describe-environment):
-        Describe project macro symbols.
-
-        * cedet/semantic/complete.el (semantic-complete-do-completion):
-        Don't call semantic-collector-current-exact-match.
-
-        * cedet/ede.el (ede-apply-preprocessor-map): Accept lists of
-        ede-objects as targets.
-
-        * cedet/ede/pmake.el (ede-proj-makefile-insert-variables): Output
-        a target's object list even if compiler vars are already in the
-        Makefile.
-
-        * cedet/ede/emacs.el (ede-preprocessor-map): Add config.h to the
-        list of headers producing necessary macros.
-
 2009-12-05  Roland Winkler  <Roland.Winkler@physik.uni-erlangen.de>
 
         * textmodes/bibtex.el (bibtex-map-entries): Use marker to keep
@@ -4157,9 +3953,6 @@
         * bookmark.el (bookmark-bmenu-hide-filenames): Remove assignment to
         deleted variable bookmark-bmenu-bookmark-column.
 
-        * cedet/semantic/idle.el (global-semantic-idle-scheduler-mode):
-        Move after definition of global-semantic-idle-tag-highlight-mode.
-
 2009-11-24  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * bookmark.el (bookmark-bmenu-search): Clear echo area when exiting.
@@ -4224,56 +4017,6 @@
         * dired-x.el (dired-guess-shell-alist-default):
         Support xz format.  (Bug#4953)
 
-2009-11-22  Chong Yidong  <cyd@stupidchicken.com>
-
-        * cedet/srecode/map.el (srecode-get-maps):
-        * cedet/semantic/wisent/wisent.el (wisent-parse-toggle-verbose-flag):
-        * cedet/semantic/wisent/comp.el (wisent-toggle-verbose-flag):
-        * cedet/semantic/decorate/mode.el (semantic-decoration-mode)
-        (semantic-toggle-decoration-style):
-        * cedet/semantic/decorate/include.el
-        (semantic-decoration-include-describe)
-        (semantic-decoration-unknown-include-describe)
-        (semantic-decoration-unparsed-include-describe)
-        (semantic-decoration-all-include-summary):
-        * cedet/semantic/bovine/c.el (semantic-c-debug-mode-init):
-        * cedet/semantic/analyze/complete.el
-        (semantic-analyze-possible-completions):
-        * cedet/semantic/util-modes.el (semantic-highlight-edits-mode)
-        (semantic-show-unmatched-syntax-mode)
-        (semantic-show-parser-state-mode, semantic-stickyfunc-mode)
-        (semantic-highlight-func-mode):
-        * cedet/semantic/util.el (semantic-describe-buffer):
-        * cedet/semantic/symref.el (semantic-symref-find-references-by-name)
-        (semantic-symref-find-tags-by-name)
-        (semantic-symref-find-tags-by-regexp)
-        (semantic-symref-find-tags-by-completion)
-        (semantic-symref-find-file-references-by-name)
-        (semantic-symref-find-text):
-        * cedet/semantic/senator.el (senator-copy-tag, senator-kill-tag)
-        (senator-yank-tag):
-        * cedet/semantic/scope.el (semantic-calculate-scope):
-        * cedet/semantic/mru-bookmark.el (semantic-mru-bookmark-mode):
-        * cedet/semantic/idle.el (semantic-idle-scheduler-mode)
-        (define-semantic-idle-service):
-        * cedet/semantic/complete.el (semantic-complete-analyze-inline)
-        (semantic-complete-analyze-inline-idle):
-        * cedet/semantic/analyze.el (semantic-analyze-current-context):
-        * cedet/mode-local.el (describe-mode-local-bindings)
-        (describe-mode-local-bindings-in-mode):
-        * cedet/ede/make.el (ede-make-check-version):
-        * cedet/ede/locate.el (ede-enable-locate-on-project):
-        * cedet/cedet-idutils.el (cedet-idutils-expand-filename)
-        (cedet-idutils-version-check):
-        * cedet/cedet-global.el (cedet-gnu-global-expand-filename)
-        (cedet-gnu-global-version-check):
-        * cedet/cedet-cscope.el (cedet-cscope-expand-filename)
-        (cedet-cscope-version-check): Use called-interactively-p instead
-        of interactive-p.
-
-        * cedet/semantic/ia.el (semantic-ia-completion-format-tag-function):
-        Use semantic-format-tag-prototype.
-
 2009-11-22  Michael Kifer  <kifer@cs.stonybrook.edu>
 
         * emulation/viper-cmd.el: Use viper-last-command-char instead of
@@ -4300,12 +4043,6 @@
         * progmodes/subword.el (subword-mode-map): Fix subword-mode-map
         generation from word-movement command names.
 
-2009-11-21  Chong Yidong  <cyd@stupidchicken.com>
-
-        * cedet/semantic/complete.el (semantic-complete-read-tag-engine)
-        (semantic-complete-jump-local, semantic-complete-jump):
-        Improve prompt string.
-
 2009-11-21  Jan Djärv  <jan.h.d@swipnet.se>
 
         * cus-start.el (all): Add native condition for font-use-system-font.
@@ -4392,13 +4129,6 @@
         (bookmark-bmenu-search): New command.
         (bookmark-bmenu-mode-map): Bind it.
 
-2009-11-20  Chong Yidong  <cyd@stupidchicken.com>
-
-        * cedet/semantic/complete.el (semantic-complete-inline-map): Doc fix.
-
-        * cedet/semantic/idle.el (define-semantic-idle-service)
-        (semantic-idle-summary-mode, semantic-idle-completions): Doc fix.
-
 2009-11-20  Tassilo Horn  <tassilo@member.fsf.org>
 
         * progmodes/cc-cmds.el: declare-functioned forward-subword and
@@ -4445,17 +4175,6 @@
 
         * Makefile.in (ELCFILES): Regenerate.
 
-2009-11-20  Chong Yidong  <cyd@stupidchicken.com>
-
-        * cedet/cedet.el (cedet-menu-map): Re-order menu items.
-
-        * cedet/semantic.el: Enable idle-mode menu items only if
-        global-semantic-idle-scheduler-mode is enabled.
-        (semantic-default-submodes): Doc fix.
-
-        * cedet/semantic/idle.el (global-semantic-idle-scheduler-mode):
-        When turning off, disable other idle modes.
-
 2009-11-20  Jay Belanger  <jay.p.belanger@gmail.com>
 
         * calc/calc.el (calc-set-mode-line):
@@ -4762,13 +4481,6 @@
         * strokes.el (strokes-update-window-configuration): Make strokes
         buffer current before erasing (Bug#4906).
 
-        * cedet/semantic/idle.el (semantic-idle-summary-mode)
-        (semantic-idle-summary-mode): Define using define-minor-mode
-        instead of define-semantic-idle-service.
-        (semantic-idle-summary-mode): New function.
-        (semantic-idle-summary-mode-setup): Use pre-command-hook to ensure
-        that mouse motion does not reset the echo area.
-
 2009-11-15  Juri Linkov  <juri@jurta.org>
 
         * simple.el (set-mark-default-inactive): Add :type, :group
@@ -5137,9 +4849,6 @@
 
 2009-11-08  Chong Yidong  <cyd@stupidchicken.com>
 
-        * cedet/semantic/ctxt.el (semantic-get-local-variables): Disable
-        the progress reporter entirely.
-
         * emulation/cua-base.el: Add CUA property to some CC mode commands
         (Bug#4100).
 
@@ -5422,79 +5131,6 @@
 
         * emacs-lisp/autoload.el (generated-autoload-feature): Remove.
         (autoload-rubric): Don't use any more.
-        * cedet/semantic/fw.el (semantic/loaddefs):
-        * cedet/srecode.el (srecode/loaddefs):
-        * cedet/ede.el (ede/loaddefs): Load rather than require.
-        * cedet/ede/cpp-root.el:
-        * cedet/ede/emacs.el:
-        * cedet/ede/files.el:
-        * cedet/ede/linux.el:
-        * cedet/ede/locate.el:
-        * cedet/ede/make.el:
-        * cedet/ede/shell.el:
-        * cedet/ede/speedbar.el:
-        * cedet/ede/system.el:
-        * cedet/ede/util.el:
-        * cedet/semantic/analyze.el:
-        * cedet/semantic/bovine.el:
-        * cedet/semantic/complete.el:
-        * cedet/semantic/ctxt.el:
-        * cedet/semantic/db-file.el:
-        * cedet/semantic/db-find.el:
-        * cedet/semantic/db-global.el:
-        * cedet/semantic/db-mode.el:
-        * cedet/semantic/db-typecache.el:
-        * cedet/semantic/db.el:
-        * cedet/semantic/debug.el:
-        * cedet/semantic/dep.el:
-        * cedet/semantic/doc.el:
-        * cedet/semantic/edit.el:
-        * cedet/semantic/find.el:
-        * cedet/semantic/format.el:
-        * cedet/semantic/html.el:
-        * cedet/semantic/ia-sb.el:
-        * cedet/semantic/ia.el:
-        * cedet/semantic/idle.el:
-        * cedet/semantic/lex-spp.el:
-        * cedet/semantic/lex.el:
-        * cedet/semantic/mru-bookmark.el:
-        * cedet/semantic/scope.el:
-        * cedet/semantic/senator.el:
-        * cedet/semantic/sort.el:
-        * cedet/semantic/symref.el:
-        * cedet/semantic/tag-file.el:
-        * cedet/semantic/tag-ls.el:
-        * cedet/semantic/tag-write.el:
-        * cedet/semantic/tag.el:
-        * cedet/semantic/util-modes.el:
-        * cedet/semantic/analyze/complete.el:
-        * cedet/semantic/analyze/refs.el:
-        * cedet/semantic/bovine/c.el:
-        * cedet/semantic/bovine/gcc.el:
-        * cedet/semantic/bovine/make.el:
-        * cedet/semantic/bovine/scm.el:
-        * cedet/semantic/decorate/include.el:
-        * cedet/semantic/decorate/mode.el:
-        * cedet/semantic/symref/cscope.el:
-        * cedet/semantic/symref/global.el:
-        * cedet/semantic/symref/grep.el:
-        * cedet/semantic/symref/idutils.el:
-        * cedet/semantic/symref/list.el:
-        * cedet/semantic/wisent/java-tags.el:
-        * cedet/semantic/wisent/javascript.el:
-        * cedet/srecode/compile.el:
-        * cedet/srecode/cpp.el:
-        * cedet/srecode/document.el:
-        * cedet/srecode/el.el:
-        * cedet/srecode/expandproto.el:
-        * cedet/srecode/getset.el:
-        * cedet/srecode/insert.el:
-        * cedet/srecode/java.el:
-        * cedet/srecode/map.el:
-        * cedet/srecode/mode.el:
-        * cedet/srecode/template.el:
-        * cedet/srecode/texi.el: Remove the file-local setting of
-        generated-autoload-feature.
 
         * emacs-lisp/byte-run.el (define-obsolete-variable-alias): Use dolist,
         and only put a prop if it is non-nil.
@@ -5511,8 +5147,6 @@
 
 2009-11-03  Glenn Morris  <rgm@gnu.org>
 
-        * cedet/mode-local.el (with-mode-local): Doc fix.
-
         * emacs-lisp/bytecomp.el (byte-compile-file-form-defvar)
         (byte-compile-file-form-define-abbrev-table)
         (byte-compile-file-form-custom-declare-variable)
@@ -5634,12 +5268,6 @@
         * menu-bar.el (menu-bar-tools-menu): Add Semantic and EDE menu
         items.
 
-        * cedet/cedet.el (cedet-menu-map): Remove Semantic and EDE menu
-        items.
-
-        * cedet/ede.el (ede-minor-mode):
-        * cedet/semantic.el (semantic-mode): Toggle menu separators.
-
 2009-10-31  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * textmodes/two-column.el (2C-split):
@@ -5793,89 +5421,12 @@
         (byte-compile-variable-ref, byte-compile-setq-default):
         Respect `constants' member of byte-compile-warnings.
 
-        * cedet/semantic/tag.el (semantic--tag-link-list-to-buffer):
-        Use mapc rather than mapcar because the return value is never used.
-
-        * cedet/srecode/template.el, cedet/semantic/wisent/javascript.el:
-        * cedet/semantic/wisent/java-tags.el, cedet/semantic/texi.el:
-        * cedet/semantic/html.el:
-        Suppress harmless warnings about setting up semantic-imenu (not
-        part of Emacs) variables.
-
 2009-10-30  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * vc-bzr.el (vc-bzr-revision-keywords): New var.
         (vc-bzr-revision-completion-table): Use it to fix completion of "s:"
         to "submit:".
 
-        * cedet/srecode/srt-mode.el (semantic-analyze-possible-completions):
-        * cedet/semantic/symref/list.el (semantic-symref-rb-toggle-expand-tag):
-        * cedet/semantic/symref/grep.el (semantic-symref-perform-search):
-        * cedet/semantic/bovine/gcc.el (semantic-gcc-query):
-        * cedet/semantic/bovine/c.el (semantic-c-parse-lexical-token):
-        * cedet/semantic/analyze/debug.el (semantic-analyzer-debug-add-buttons)
-        (semantic-analyzer-debug-global-symbol)
-        (semantic-analyzer-debug-missing-innertype)
-        (semantic-analyzer-debug-insert-include-summary):
-        * cedet/semantic/util.el (semantic-file-tag-table):
-        (semantic-describe-buffer-var-helper, semantic-something-to-tag-table)
-        (semantic-recursive-find-nonterminal-by-name):
-        * cedet/semantic/tag-ls.el (semantic-tag-calculate-parent-default):
-        * cedet/semantic/tag-file.el (semantic-prototype-file):
-        * cedet/semantic/symref.el (semantic-symref-parse-tool-output):
-        * cedet/semantic/sb.el (semantic-sb-fetch-tag-table):
-        * cedet/semantic/lex-spp.el (semantic-lex-spp-lex-text-string):
-        * cedet/semantic/idle.el (semantic-idle-work-for-one-buffer):
-        (semantic-idle-summary-maybe-highlight):
-        * cedet/semantic/ia-sb.el (semantic-ia-speedbar)
-        (semantic-ia-sb-tag-info):
-        * cedet/semantic/grammar.el (semantic-analyze-possible-completions):
-        * cedet/semantic/find.el (semantic-brute-find-tag-by-position):
-        * cedet/semantic/ede-grammar.el (project-compile-target):
-        (ede-proj-makefile-insert-variables):
-        * cedet/semantic/debug.el (semantic-debug-set-parser-location):
-        (semantic-debug-set-source-location, semantic-debug-interface-layout)
-        (semantic-debug-mode, semantic-debug):
-        * cedet/semantic/db.el (semanticdb-needs-refresh-p):
-        * cedet/semantic/db-typecache.el (semanticdb-typecache-refresh-for-buffer):
-        * cedet/semantic/db-javascript.el (semanticdb-equivalent-mode):
-        * cedet/semantic/db-find.el (semanticdb-find-log-new-search)
-        (semanticdb-find-translate-path-includes--internal)
-        (semanticdb-reset-log, semanticdb-find-log-activity):
-        * cedet/semantic/db-file.el (object-write):
-        * cedet/semantic/db-el.el (semanticdb-equivalent-mode):
-        * cedet/semantic/db-ebrowse.el (semanticdb-ebrowse-C-file-p)
-        (semanticdb-create-ebrowse-database):
-        * cedet/semantic/db-debug.el (semanticdb-table-sanity-check):
-        * cedet/semantic/complete.el (semantic-displayor-focus-request)
-        (semantic-collector-calculate-completions-raw)
-        (semantic-complete-read-tag-analyzer):
-        * cedet/semantic/analyze.el (semantic-analyze-pulse):
-        * cedet/ede/util.el (ede-update-version-in-source):
-        * cedet/ede/proj.el (project-delete-target):
-        * cedet/ede/proj-elisp.el (ede-update-version-in-source)
-        (ede-proj-flush-autoconf):
-        * cedet/ede/pconf.el (ede-proj-configure-synchronize)
-        (ede-proj-configure-synchronize):
-        * cedet/ede/locate.el (ede-locate-file-in-project-impl):
-        * cedet/ede/linux.el (ede-linux-version):
-        * cedet/ede/emacs.el (ede-emacs-version):
-        * cedet/ede/dired.el (ede-dired-add-to-target):
-        * cedet/ede.el (ede-buffer-header-file, ede-find-target)
-        (ede-buffer-documentation-files, ede-project-buffers, ede-set)
-        (ede-target-buffers, ede-buffers, ede-make-project-local-variable):
-        * cedet/cedet-idutils.el (cedet-idutils-fnid-call):
-        (cedet-idutils-lid-call, cedet-idutils-expand-filename)
-        (cedet-idutils-version-check):
-        * cedet/cedet-global.el (cedet-gnu-global-call):
-        (cedet-gnu-global-expand-filename, cedet-gnu-global-root)
-        (cedet-gnu-global-version-check, cedet-gnu-global-scan-hits):
-        * cedet/cedet-cscope.el (cedet-cscope-call)
-        (cedet-cscope-expand-filename, cedet-cscope-version-check):
-        Use with-current-buffer.
-        * cedet/ede.el (ede-make-project-local-variable)
-        (ede-set-project-variables, ede-set): Use dolist.
-
 2009-10-30  Dan Nicolaescu  <dann@ics.uci.edu>
 
         * textmodes/ispell.el (ispell-skip-region-alist):
@@ -5919,16 +5470,6 @@
         (calc-embedded-finish-command, calc-embedded-stack-change):
         * calc/calc-aent.el (calcAlg-enter): Use with-current-buffer.
 
-        * cedet/mode-local.el (make-obsolete-overload): Add `when' argument.
-        (overload-docstring-extension): Use that info.
-        * cedet/semantic/fw.el (semantic-alias-obsolete): Pass the `when' info.
-        * cedet/semantic/idle.el (semantic-eldoc-current-symbol-info):
-        * cedet/semantic/tag-ls.el (semantic-nonterminal-protection)
-        (semantic-nonterminal-abstract, semantic-nonterminal-leaf)
-        (semantic-nonterminal-full-name): Add the new `when' info.
-        * cedet/semantic/decorate/mode.el (semantic/decorate): Require CL for
-        `assert'.
-
         * pcomplete.el (pcomplete-comint-setup): If there's a choice, replace
         shell-dynamic-complete-filename in preference to
         comint-dynamic-complete-filename.
@@ -6069,36 +5610,6 @@
         * bookmark.el (bookmark-bmenu-list): Don't use switch-to-buffer if
         we're inside a dedicated or minibuffer window.
 
-2009-10-25  Stefan Monnier  <monnier@iro.umontreal.ca>
-
-        * cedet/semantic/fw.el (semantic-alias-obsolete)
-        (semantic-varalias-obsolete): Make the `when' arg mandatory.
-        (define-mode-overload-implementation):
-        * cedet/semantic/decorate/mode.el (semantic-decorate-pending-decoration-hooks):
-        * cedet/semantic/wisent.el (wisent-lex-make-token-table):
-        * cedet/semantic/util.el (semantic-file-token-stream)
-        (semantic-something-to-stream):
-        * cedet/semantic/tag.el (semantic-tag-make-assoc-list)
-        (semantic-expand-nonterminal):
-        * cedet/semantic/tag-file.el (semantic-find-nonterminal)
-        (semantic-find-dependency, semantic-find-nonterminal)
-        (semantic-find-dependency):
-        * cedet/semantic/lex.el (semantic-flex-start, semantic-flex-end)
-        (semantic-flex-text, semantic-flex-make-keyword-table)
-        (semantic-flex-keyword-p, semantic-flex-keyword-put)
-        (semantic-flex-keyword-get, semantic-flex-map-keywords)
-        (semantic-flex-keywords, semantic-flex-buffer, semantic-flex-list):
-        * cedet/semantic/java.el (semantic-java-prototype-nonterminal):
-        * cedet/semantic/idle.el (semantic-before-idle-scheduler-reparse-hooks)
-        (semantic-after-idle-scheduler-reparse-hooks):
-        * cedet/semantic/edit.el (semantic-edits-incremental-reparse-failed-hooks):
-        * cedet/semantic/db-mode.el (semanticdb-mode-hooks):
-        * cedet/semantic.el (semantic-toplevel-bovine-table)
-        (semantic-toplevel-bovine-cache)
-        (semantic-before-toplevel-bovination-hook, semantic-init-hooks)
-        (semantic-init-mode-hooks, semantic-init-db-hooks)
-        (semantic-bovination-working-type): Provide the `when' arg.
-
 2009-10-24  Karl Fogel  <kfogel@red-bean.com>
 
         * bookmark.el: Update documentation, especially documentation
@@ -6127,15 +5638,6 @@
         * files.el (delete-directory): Delete symlinks to directories with
         delete-file (Bug#4739).
 
-2009-10-24  Chong Yidong  <cyd@stupidchicken.com>
-
-        * cedet/semantic/util.el (semantic-recursive-find-nonterminal-by-name):
-        * cedet/semantic/tag.el (semantic-token-type-parent): Add WHEN
-        argument to make-obsolete.
-
-        * cedet/semantic/fw.el (semantic-alias-obsolete)
-        (semantic-varalias-obsolete): Add optional WHEN argument.
-
 2009-10-24  Dan Nicolaescu  <dann@ics.uci.edu>
 
         * vc.el (vc-backend-for-registration): Rename from
@@ -6337,16 +5839,6 @@
 
         * help-fns.el: Don't require help-mode (to avoid bootstrap issues).
 
-2009-10-21  Eric Ludlam  <zappo@gnu.org>
-
-        * cedet/semantic/bovine/c.el (semantic-c-debug-mode-init)
-        (semantic-c-debug-mode-init-pch): New functions.
-        (semantic-c-debug-mode-init-last-mode): New var.
-        (semantic-c-parse-lexical-token): Use them.
-
-        * cedet/semantic/lex-spp.el (semantic-lex-spp-anlyzer-do-replace):
-        When extracting the argument list, limit only by point-max.
-
 2009-10-21  Michael Albinus  <michael.albinus@gmx.de>
 
         * net/tramp-smb.el (tramp-smb-get-stat-capability): New defun.
@@ -6461,81 +5953,6 @@
         (tar-header-block-tokenize): Decode the username and groupname.
         (tar-chown-entry, tar-chgrp-entry): Encode the names (bug#4730).
 
-2009-10-17  Chong Yidong  <cyd@stupidchicken.com>
-
-        * cedet/srecode/srt.el:
-        * cedet/srecode/compile.el:
-        * cedet/semantic/mru-bookmark.el:
-        * cedet/semantic/debug.el:
-        * cedet/semantic/complete.el:
-        * cedet/semantic/analyze.el: Require CL when compiling.
-
-2009-10-17  Eric Ludlam  <zappo@gnu.org>
-
-        * cedet/semantic/scope.el
-        (semantic-analyze-scoped-inherited-tag-map): Wrap calculation of
-        tmpscope so that the regular scope will continue to work.
-
-        * cedet/semantic/idle.el (semantic-idle-tag-highlight):
-        Use semantic-idle-summary-highlight-face as the highlighting.
-
-        * emacs-lisp/eieio-base.el (eieio-persistent-save): If buffer
-        contains multibyte characters, choose first applicable coding
-        system automatically.
-
-        * cedet/ede/project-am.el (project-run-target): New method.
-        (project-run-target): New method.
-
-        * cedet/ede.el (ede-target): Add run target menu item.
-        (ede-project, ede-minor-keymap): Add ede-run-target binding.
-        (ede-run-target): New function.
-        (ede-target::project-run-target): New method.
-
-        * cedet/ede/proj.el (project-run-target): New method.
-
-        * cedet/ede/proj-shared.el (ede-gcc-libtool-shared-compiler)
-        (ede-g++-libtool-shared-compiler): Remove SHELL.  Remove COMMANDS.
-        Add :rules.
-        (ede-proj-target-makefile-shared-object): Only libtool compilers
-        now available.  Add linkers for libtool.
-        (ede-cc-linker-libtool, ede-g++-linker-libtool): New.
-        (ede-proj-makefile-target-name): Always use .la extension.
-
-        * cedet/ede/proj-prog.el (project-run-target): New method.
-
-        * cedet/ede/proj-obj.el (ede-cc-linker): Rename from ede-gcc-linker.
-        (ede-g++-linker): Change Change link lines.
-
-        * cedet/ede/pmake.el (ede-pmake-insert-variable-shared):
-        When searching for old variables, go to the end of the buffer and
-        search backward from there.
-        (ede-proj-makefile-automake-insert-subdirs)
-        (ede-proj-makefile-automake-insert-extradist): New methods.
-        (ede-proj-makefile-create): Use them.
-
-        * cedet/ede/pconf.el (ede-proj-configure-test-required-file):
-        Force FILE to expand to the current target.  Use file-exists-p to
-        check that it exists.
-
-        * cedet/ede/linux.el (ede-linux-version): Don't call "head".
-        (ede-linux-load): Wrap dir in file-name-as-directory.
-        Set :version slot.
-
-        * cedet/ede/files.el (ede-get-locator-object): When enabling
-        locate, do so on "top".
-
-        * cedet/ede/emacs.el (ede-emacs-file-existing): Wrap "dir" in
-        file-name-as-directory during compare.
-        (ede-emacs-version): Return Emacs/XEmacs differentiator.
-        Get version number from different places.  Don't call egrep.
-        (ede-emacs-load): Set :version slot.  Call file-name-as-directory
-        to set the directory.
-
-        * cedet/ede/shell.el: New file.
-
-        * cedet/inversion.el (inversion-decoders): Allow for stray . in
-        alpha/beta variants.
-
 2009-10-17  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * international/mule-cmds.el (select-safe-coding-system): If the file
@@ -6543,9 +5960,6 @@
 
 2009-10-17  Glenn Morris  <rgm@gnu.org>
 
-        * cedet/semantic/grammar.el (semantic-grammar--lex-delim-spec):
-        All errors should have messages.
-
         * foldout.el (foldout-mouse-swallow-events):
         * gs.el (gs-load-image): Replace obsolete forms of sit-for, sleep-for.
 
@@ -6844,16 +6258,6 @@
         * calendar/calendar.el (calendar-split-width-threshold): New option.
         (calendar-basic-setup): Use calendar-split-width-threshold.
 
-2009-10-10  Sascha Wilde  <wilde@sha-bang.de>
-
-        * cedet/ede/proj-shared.el (ede-proj-makefile-target-name):
-        Use .la for Automake.
-
-2009-10-09  Chong Yidong  <cyd@stupidchicken.com>
-
-        * cedet/ede/pconf.el (ede-proj-configure-synchronize):
-        Use "autoreconf -i".  Suggested by Andreas Schwab.
-
 2009-10-09  Juanma Barranquero  <lekktu@gmail.com>
 
         * international/mule-cmds.el (ucs-names): Exclude new "Enclosed
@@ -6882,13 +6286,6 @@
         (bookmark-jump-other-window): Just invoke bookmark-jump with new
         argument now, so the two function's behaviors will match.  (Bug#3645)
 
-2009-10-08  Chong Yidong  <cyd@stupidchicken.com>
-
-        * cedet/ede/proj.el (project-make-dist, project-compile-project):
-        Fix filename test.
-        (ede-proj-dist-makefile): Use expand-file-name instead of concat
-        to expand file names.
-
 2009-10-08  Michael Albinus  <michael.albinus@gmx.de>
 
         * net/tramp.el (tramp-file-name-real-user, tramp-file-name-domain)
@@ -6900,15 +6297,6 @@
         (tramp-smb-handle-expand-file-name): Implement "~" expansion.
         (tramp-smb-maybe-open-connection): Flush the cache only if necessary.
 
-2009-10-08  Chong Yidong  <cyd@stupidchicken.com>
-
-        * cedet/ede/proj-obj.el (ede-gcc-linker): New var.
-        (ede-proj-target-makefile-objectcode): Use it.
-
-        * cedet/ede/source.el (ede-want-any-source-files-p)
-        (ede-want-any-auxiliary-files-p, ede-want-any-files-p):
-        Return search result.  This error was introduced while merging.
-
 2009-10-07  Juanma Barranquero  <lekktu@gmail.com>
 
         * makefile.w32-in (WINS_UPDATES): Fix typo in previous change.
@@ -7183,26 +6571,6 @@
         (Info-bookmark-jump): Document with a doc string, not just a comment.
         (Bug#4203)
 
-2009-10-04  Chong Yidong  <cyd@stupidchicken.com>
-
-        * cedet/semantic.el (semantic-new-buffer-setup-functions): New option.
-        (semantic-new-buffer-fcn): Call parser setup functions here.
-        (semantic-mode): Don't call parser setup functions here, it's done
-        in semantic-new-buffer-fcn now.
-        (semantic-mode): Parse all existing buffers when enabled.
-
-        * cedet/srecode/compile.el (srecode-compile-file):
-        Call semantic-new-buffer-fcn if the buffer has not been parsed.
-
-2009-10-04  Chong Yidong  <cyd@stupidchicken.com>
-
-        * cedet/ede/pmake.el (ede-pmake-insert-variable-once): Delete.
-
-        * cedet/ede/proj-comp.el: Don't require ede/pmake at toplevel.
-        (proj-comp-insert-variable-once): New macro, renamed from
-        ede-pmake-insert-variable-once in ede/pmake.edl.
-        (ede-proj-makefile-insert-variables): Use it.
-
 2009-10-04  Michael Albinus  <michael.albinus@gmx.de>
 
         * files.el (copy-directory): New defun.
@@ -7211,35 +6579,12 @@
 
 2009-10-04  Juanma Barranquero  <lekktu@gmail.com>
 
-        * cedet/ede/makefile-edit.el (makefile-beginning-of-command)
-        (makefile-end-of-command):
-        * cedet/srecode/srt-mode.el (semantic-beginning-of-context)
-        (semantic-end-of-context): Fix previous change.  Doc fixes.
-
-2009-10-04  Juanma Barranquero  <lekktu@gmail.com>
-
         * files-x.el (modify-dir-local-variable)
-        (copy-dir-locals-to-file-locals-prop-line):
-        * cedet/ede/makefile-edit.el (makefile-beginning-of-command)
-        (makefile-end-of-command):
-        * cedet/semantic/lex.el (semantic-lex-token):
-        * cedet/semantic/analyze/fcn.el
-        (semantic-analyze-dereference-metatype-1):
-        * cedet/semantic/bovine/c.el (semantic-lex-cpp-define)
-        (semantic-lex-cpp-undef):
-        * cedet/semantic/wisent/wisent.el (wisent-skip-block):
-        * cedet/srecode/srt-mode.el (semantic-beginning-of-context)
-        (semantic-end-of-context): Fix typos in docstrings.
+        (copy-dir-locals-to-file-locals-prop-line): Fix typos in
+        docstrings.
 
         * recentf.el (recentf-unload-function): New function.
 
-2009-10-04  Chong Yidong  <cyd@stupidchicken.com>
-
-        * cedet/ede.el (ede-project-placeholder-cache-file):
-        * cedet/semantic/db-file.el (semanticdb-default-save-directory):
-        * cedet/srecode/map.el (srecode-map-save-file):
-        Use locate-user-emacs-file.  Suggested by Juanma Barranquero.
-
 2009-10-04  Glenn Morris  <rgm@gnu.org>
 
         * window.el (window-full-height-p): Add doc string.
@@ -7248,51 +6593,6 @@
 
         * window.el (window-full-height-p): New function.  (Bug#4543)
 
-2009-10-03  Chong Yidong  <cyd@stupidchicken.com>
-
-        * cedet/srecode/insert.el: Require srecode/args.
-
-        * cedet/srecode/args.el: Require srecode/dictionary instead of
-        srecode/insert.
-
-        * cedet/srecode/srt-mode.el (srecode-template-mode): Doc fix.
-
-        * files.el (auto-mode-alist): Add .srt and Project.ede.
-
-        * cedet/semantic.el (semantic-mode):
-        Handle srecode-template-mode-hook as well.
-        (semantic-mode): Use js-mode-hook for Javascript hook.
-
-        * cedet/srecode/template.el: Remove hook variable.
-
-        * cedet/ede/proj-comp.el: Require ede/pmake when compiling.
-
-        * cedet/ede.el (ede-target-forms-menu): Don't enable if no
-        projects exist.
-        (ede-project-placeholder-cache-file): Default to a file in
-        user-emacs-directory.
-
-        * cedet/srecode/map.el (srecode-map-base-template-dir): Look for
-        templates in data-directory.
-        (srecode-map-save-file): Default to a file in user-emacs-directory.
-
-        * cedet/ede/srecode.el (ede-srecode-setup): Use default templates
-        directory.
-
-2009-09-30  Eric Ludlam  <zappo@gnu.org>
-
-        * cedet/semantic/util-modes.el (semantic-highlight-func-mode):
-        Doc fix.
-
-        * cedet/ede/proj-comp.el (ede-proj-makefile-insert-variables):
-        Only insert each variable once.
-
-        * cedet/ede/pmake.el (ede-pmake-insert-variable-once): New macro.
-        (ede-pmake-insert-variable-shared): Use it.
-
-        * cedet/ede/cpp-root.el (ede-preprocessor-map): Do not deref table
-        for lexical table iff table is nil.
-
 2009-10-03  Dan Nicolaescu  <dann@ics.uci.edu>
 
         * vc.el: Remove commented out code.
@@ -7312,9 +6612,6 @@
         the frame is wide.
         (calendar-generate-window): Test for shrinkability rather than width.
 
-        * cedet/semantic/db-find.el (data-debug-insert-tag-list): Comment out
-        declaration, currently false.
-
         * mail/rmail.el (rmail-generate-viewer-buffer): Be more careful about
         reusing existing buffers, in case we happen to visit two files with the
         same basename.  (Bug#4593)
@@ -7584,142 +6881,10 @@
         * emacs-lisp/eieio.el (defclass, eieio-defclass-autoload)
         (eieio-copy-parents-into-subclass, make-instance, class-children)
         (eieio-generic-form):
-        * cedet/cedet-files.el (cedet-directory-name-to-file-name):
-        * cedet/cedet-idutils.el (cedet-idutils-search)
-        (cedet-idutils-expand-filename, cedet-idutils-support-for-directory)
-        (cedet-idutils-version-check):
-        * cedet/cedet.el (cedet-version):
-        * cedet/data-debug.el (data-debug-insert-overlay-button)
-        (data-debug-insert-overlay-list-button)
-        (data-debug-insert-buffer-button)
-        (data-debug-insert-buffer-list-button)
-        (data-debug-insert-process-button, data-debug-insert-ring-button)
-        (data-debug-insert-widget, data-debug-insert-stuff-list-button)
-        (data-debug-insert-stuff-vector-button)
-        (data-debug-insert-symbol-button, data-debug-insert-string)
-        (data-debug-insert-number, data-debug-insert-lambda-expression)
-        (data-debug-insert-nil, data-debug-insert-simple-thing)
-        (data-debug-insert-custom, data-debug-edebug-expr):
-        * cedet/ede.el (ede-auto-add-method, ede-project-class-files)
-        (global-ede-mode-map, ede-new, ede-debug-target)
-        (ede-customize-current-target, ede-buffers, ede-map-buffers, ede-set):
-        * cedet/semantic.el (semantic-minimum-working-buffer-size)
-        (semantic-fetch-tags, semantic-submode-list)
-        (semantic-default-submodes):
-        * cedet/ede/source.el (ede-source-match):
-        * cedet/ede/project-am.el (project-am-type-alist, project-add-file)
-        (project-am-package-info):
-        * cedet/ede/proj.el (ede-proj-target, project-new-target):
-        * cedet/ede/proj-elisp.el (ede-proj-tweak-autoconf):
-        * cedet/ede/proj-comp.el (ede-current-build-list):
-        * cedet/ede/makefile-edit.el (makefile-move-to-macro):
-        * cedet/ede/files.el (ede-toplevel-project-or-nil):
-        * cedet/ede/cpp-root.el (initialize-instance):
-        * cedet/ede/autoconf-edit.el (autoconf-find-last-macro)
-        (autoconf-parameter-strip, autoconf-insert-new-macro):
-        * cedet/semantic/wisent.el (wisent-lex-eoi):
-        * cedet/semantic/util-modes.el (global-semantic-show-parser-state-mode)
-        (semantic-show-parser-state-mode):
-        * cedet/semantic/texi.el (semantic-texi-environment-regexp):
-        * cedet/semantic/tag.el (semantic-tag-new-variable)
-        (semantic-tag-class, semantic-tag-new-variable, semantic-tag-copy)
-        (semantic--tag-deep-copy-attributes, semantic--tag-deep-copy-value)
-        (semantic--tag-deep-copy-tag-list)
-        (semantic-tag-components-with-overlays-default):
-        * cedet/semantic/symref.el (semantic-symref-find-text):
-        * cedet/semantic/senator.el (senator-yank-tag)
-        (senator-transpose-tags-up):
-        * cedet/semantic/scope.el (semantic-analyze-scoped-tags-default)
-        (semantic-analyze-scoped-inherited-tags, semantic-scope-find):
-        * cedet/semantic/sb.el (semantic-sb-autoexpand-length):
-        * cedet/semantic/lex.el (semantic-lex-comment-regex)
-        (semantic-lex-maximum-depth, define-lex, semantic-lex-token)
-        (semantic-lex-unterminated-syntax-protection, define-lex-analyzer):
-        * cedet/semantic/lex-spp.el
-        (semantic-lex-spp-dynamic-macro-symbol-obarray-stack)
-        (semantic-lex-spp-symbol, semantic-lex-spp-one-token-to-txt):
-        * cedet/semantic/idle.el
-        (semantic-idle-summary-current-symbol-info-brutish)
-        (semantic-idle-summary-current-symbol-info-default):
-        * cedet/semantic/grammar.el (semantic-grammar-recreate-package)
-        (semantic--grammar-macro-compl-dict):
-        * cedet/semantic/grammar-wy.el (semantic-grammar-wy--parse-table):
-        * cedet/semantic/format.el (semantic-format-tag-custom-list)
-        (semantic-format-tag-canonical-name-default):
-        * cedet/semantic/find.el (semantic-find-tag-by-overlay-in-region)
-        (semantic-find-tags-for-completion)
-        (semantic-find-tags-by-scope-protection-default)
-        (semantic-deep-find-tags-for-completion):
-        * cedet/semantic/edit.el
-        (semantic-edits-incremental-reparse-failed-hook)
-        (semantic-edits-verbose-flag, semantic-edits-assert-valid-region)
-        (semantic-edits-splice-remove, semantic-edits-splice-replace):
-        * cedet/semantic/doc.el (semantic-documentation-comment-preceeding-tag):
-        * cedet/semantic/dep.el (semantic-dependency-include-path):
-        * cedet/semantic/db.el (semanticdb-default-find-index-class)
-        (semanticdb-match-any-mode, semanticdb-with-match-any-mode)
-        (semanticdb-project-roots):
-        * cedet/semantic/db-find.el (semanticdb-implied-include-tags)
-        (semanticdb-find-adebug-insert-scanned-tag-cons)
-        (semanticdb-find-log-buffer-name, semanticdb-find-result-mapc)
-        (semanticdb-brute-deep-find-tags-for-completion):
-        * cedet/semantic/db-ebrowse.el (semanticdb-ebrowse-add-tree-to-table):
-        * cedet/semantic/ctxt.el (semantic-beginning-of-context-default)
-        (semantic-end-of-context-default)
-        (semantic-ctxt-current-function-default)
-        (semantic-ctxt-scoped-types-default):
-        * cedet/semantic/complete.el (semantic-complete-read-tag-engine)
-        (semantic-complete-inline-tag-engine)
-        (semantic-complete-inline-custom-type)
-        (semantic-complete-read-tag-analyzer):
-        * cedet/semantic/chart.el (semantic-chart-tags-by-class)
-        (semantic-chart-database-size):
-        * cedet/semantic/analyze.el (semantic-analyze-current-symbol)
-        (semantic-analyze-current-context):
-        * cedet/semantic/symref/list.el (semantic-symref)
-        (semantic-symref-hide-buffer, semantic-symref-symbol):
-        * cedet/semantic/symref/grep.el (semantic-symref-grep-use-template):
-        * cedet/semantic/symref/filter.el (semantic-symref-hits-in-region):
-        * cedet/semantic/bovine/el.el (semantic-elisp-form-to-doc-string):
-        * cedet/semantic/bovine/c.el (semantic-lex-c-preprocessor-symbol-map)
-        (semantic-c-parse-token-hack-depth, semantic-c--template-name-1)
-        (semantic-c-dereference-template):
-        * cedet/semantic/analyze/refs.el (semantic--analyze-refs-full-lookup)
-        (semantic--analyze-refs-full-lookup-with-parents)
-        (semantic--analyze-refs-full-lookup-simple):
-        * cedet/semantic/analyze/complete.el
-        (semantic-analyze-possible-completions):
-        * cedet/srecode/table.el (srecode-mode-table-new):
-        * cedet/srecode/srt.el (srecode-read-variable-name):
-        * cedet/srecode/srt-mode.el (srecode-macro-help, srecode-in-macro-p):
-        * cedet/srecode/semantic.el (srecode-semantic-handle-:tag)
-        (srecode-semantic-handle-:tagtype, srecode-semantic-insert-tag):
-        * cedet/srecode/map.el (srecode-current-map):
-        * cedet/srecode/insert.el (srecode-insert)
-        (srecode-insert-variable-secondname-handler, srecode-insert-method)
-        (srecode-template-inserter-point-override)
-        (srecode-insert-include-lookup):
-        * cedet/srecode/getset.el (srecode-auto-choose-class):
-        * cedet/srecode/extract.el (srecode-inserter-extract):
-        * cedet/srecode/document.el
-        (srecode-document-autocomment-return-last-alist)
-        (srecode-document-autocomment-param-type-alist)
-        (srecode-document-insert-function-comment)
-        (srecode-document-insert-variable-one-line-comment)
-        (srecode-document-function-name-comment):
-        * cedet/srecode/dictionary.el (srecode-create-dictionary)
-        (srecode-compound-toString):
-        * cedet/srecode/compile.el (srecode-flush-active-templates):
-        * cedet/srecode/args.el (srecode-semantic-handle-:blank):
-        Doc/message fixes.
 
         * vc-cvs.el (vc-cvs-parse-entry): Be more careful with the
         match-data.  (Bug#4555).
 
-        * cedet/semantic/bovine/gcc.el
-        (semantic-c-reset-preprocessor-symbol-map): Fix declaration.
-        (semantic-gcc-get-include-paths, semantic-gcc-setup-data): Doc fixes.
-
         * emacs-lisp/check-declare.el (check-declare-scan): Read the declaration
         rather than parsing it as a regexp.  This relaxes the layout
         requirements and makes errors easier to detect.
@@ -7734,41 +6899,8 @@
         * term/w32-win.el (setup-default-fontset, set-fontset-font):
         Remove unused declarations.
 
-2009-10-01  Juanma Barranquero  <lekktu@gmail.com>
-
-        * cedet/semantic/wisent/javat-wy.el
-        (wisent-java-tags-wy--keyword-table): Use \000 instead of literal ^@.
-
-2009-09-30  Juanma Barranquero  <lekktu@gmail.com>
-
-        * cedet/srecode/expandproto.el: Fix provide statement.
-
-2009-09-30  Eric Ludlam  <zappo@gnu.org>
-
-        * emacs-lisp/eieio.el (boolean-p): Delete.
-
-2009-09-30  Sascha Wilde  <wilde@sha-bang.de>
-
-        * cedet/ede/srecode.el: Fix provide statement.
-
 2009-09-30  Glenn Morris  <rgm@gnu.org>
 
-        * cedet/ede/proj.el (ede-proj-target-makefile-miscelaneous):
-        * cedet/ede/proj-aux.el (ede-aux-source):
-        * cedet/ede/proj-misc.el (ede-proj-target-makefile-miscelaneous)
-        (ede-misc-source):
-        * cedet/semantic/mru-bookmark.el (semantic-mrub-completing-read)
-        (semantic-mrub-switch-tags): Fix doc typos.
-
-        * cedet/semantic/db-global.el (data-debug-new-buffer)
-        (data-debug-insert-thing): Remove unneeded declarations (one broken).
-        (semanticdb-enable-gnu-global-databases): Fix prompt typo.
-
-        * cedet/semantic/analyze/fcn.el (semantic-scope-find): Fix declaration.
-
-        * cedet/semantic/bovine/gcc.el (semantic-gcc-setup): Replace runtime
-        use of CL function `remove-if-not'.
-
         * emacs-lisp/authors.el (authors-ignored-files): Add "js2-mode.el".
 
         * emacs-lisp/elint.el (elint-init-form): Report declarations where the
@@ -7806,16 +6938,6 @@
 
 2009-09-29  Glenn Morris  <rgm@gnu.org>
 
-        * cedet/semantic/symref/idutils.el:
-        * cedet/semantic/symref/list.el: Relicense under GPLv3+.
-
-        * cedet/ede/srecode.el (srecode-resolve-arguments): Fix declaration.
-
-        * cedet/semantic/complete.el (semantic-displayor-focus-abstract-child-p):
-        * cedet/semantic/tag-file.el (semanticdb-table-child-p):
-        * cedet/srecode/compile.el (srecode-template-inserter-newline-child-p):
-        Mark declarations not understood by check-declare.
-
         * emacs-lisp/check-declare.el (check-declare-locate): Remove pointless
         file-name-nondirectory call preventing location of cedet files.
         (check-declare-verify): Use literal search rather than re-search.
@@ -7853,15 +6975,6 @@
 
         * Makefile.in (ELCFILES): Add CEDET files.
 
-2009-09-28  Eric Ludlam  <zappo@gnu.org>
-
-        CEDET (development tools) package merged.
-
-        * cedet/*.el:
-        * cedet/ede/*.el:
-        * cedet/semantic/*.el:
-        * cedet/srecode/*.el: New files.
-
 2009-09-28  Michael Albinus  <michael.albinus@gmx.de>
 
         * Makefile.in (ELCFILES): Add net/tramp-imap.elc.
@@ -7875,26 +6988,6 @@
 
         * net/tramp-imap.el: New package.
 
-2009-09-28  Eric Ludlam  <zappo@gnu.org>
-
-        * emacs-lisp/chart.el:
-        * emacs-lisp/eieio-base.el:
-        * emacs-lisp/eieio-comp.el:
-        * emacs-lisp/eieio-custom.el:
-        * emacs-lisp/eieio-datadebug.el:
-        * emacs-lisp/eieio-opt.el:
-        * emacs-lisp/eieio-speedbar.el:
-        * emacs-lisp/eieio.el: New files.
-
-        * cedet/cedet-cscope.el:
-        * cedet/cedet-files.el:
-        * cedet/cedet-global.el:
-        * cedet/cedet-idutils.el:
-        * cedet/data-debug.el:
-        * cedet/inversion.el:
-        * cedet/mode-local.el:
-        * cedet/pulse.el: New files.
-
 2009-09-27  Vinicius Jose Latorre  <viniciusjl@ig.com.br>
 
         * whitespace.el (whitespace-trailing-regexp)